Backing out patch for bug 24651 until we can make initial button state honor preferences. a=tor

suite/common/pref/pref-navigator.xul

@@ -36,7 +36,7 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["startupPage", "browserStartupHomepage",
-                       "bookmarksButton", "clearButton", "goButton",
+                       "bookmarksButton", "goButton",
                        "homeButton", "printButton",
                        "searchButton" ];
   ]]>
@@ -101,9 +101,6 @@
       	      <checkbox id="printButton"
                         label="&printButton.label;"
                         prefstring="browser.toolbars.showbutton.print"/>
-      	      <checkbox id="clearButton"
-                        label="&clearButton.label;"
-                        prefstring="browser.toolbars.showbutton.clear"/>
       </vbox>
       <vbox id="prefShowButtonBox">
 

suite/locales/en-US/chrome/common/pref/pref-navigator.dtd

@@ -20,7 +20,6 @@
 <!ENTITY  toolbarIntro.label        "Select the buttons you want to see in the toolbars">
 
 <!ENTITY  bookmarksButton.label     "Bookmarks">
-<!ENTITY  clearButton.label         "Clear">
 <!ENTITY  goButton.label            "Go">
 <!ENTITY  homeButton.label          "Home">
 <!ENTITY  printButton.label         "Print">