back out extra changes committed by mistake. I'm turning in Ben!

browser/base/content/browser.js

@@ -3066,11 +3066,6 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
     BookmarksToolbar.resizeFunc(null);
   }
 
-  // fix bug 291781 - controller has been lost while removeChild and appendChild
-  var bm = document.getElementById("bookmarks-menu");
-  if (bm)
-    bm.controllers.appendController(BookmarksMenuController);
-
   // XXX Shouldn't have to do this, but I do
   window.focus();
 }
@@ -6055,34 +6050,16 @@ var FeedHandler = {
   updateFeeds: function() {
     if (!this._feedButton)
       this._feedButton = document.getElementById("feed-button");
-    if (!this._feedMenuitem)
-      this._feedMenuitem = document.getElementById("addLiveBookmarkMenuitem");
-    if (!this._feedMenupopup)
-      this._feedMenupopup = document.getElementById("addLiveBookmarkMenupopup");
 
     var feeds = gBrowser.mCurrentBrowser.feeds;
     if (!feeds || feeds.length == 0) {
       this._feedButton.removeAttribute("feeds");
       this._feedButton.setAttribute("tooltiptext", 
                                     gNavigatorBundle.getString("feedNoFeeds"));
-      this._feedMenuitem.setAttribute("disabled", "true");
-      this._feedMenupopup.setAttribute("collapsed", "true");
-      this._feedMenuitem.removeAttribute("collapsed");
     } else {
       this._feedButton.setAttribute("feeds", "true");
       this._feedButton.setAttribute("tooltiptext", 
                                     gNavigatorBundle.getString("feedHasFeeds"));
-
-      // check for dupes before we pick which UI to expose
-      feeds = this.harvestFeeds(feeds);
-      
-      if (feeds.length > 1) {
-        this._feedMenuitem.setAttribute("collapsed", "true");
-        this._feedMenupopup.removeAttribute("collapsed");
-      } else {
-        this._feedMenuitem.removeAttribute("disabled");
-        this._feedMenuitem.removeAttribute("collapsed");
-        this._feedMenupopup.setAttribute("collapsed", "true");
       }
     }
   },