--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1812,49 +1812,8 @@ var BookmarkingUI = {
     if (aNode.getAttribute("label") != this._starButtonLabel)
       aNode.setAttribute("label", this._starButtonLabel);
   },
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsINavBookmarkObserver
   ])
 };
-
-var AutoShowBookmarksToolbar = {
-  init() {
-    PlacesUtils.addLazyBookmarkObserver(this, false);
-  },
-
-  uninit() {
-    PlacesUtils.removeLazyBookmarkObserver(this);
-  },
-
-  onItemAdded(aItemId, aParentId, aIndex, aItemType, aURI, aTitle, aDateAdded,
-              aGuid, aParentGuid) {
-    this._autoshow(aParentGuid);
-  },
-  onBeginUpdateBatch() {},
-  onEndUpdateBatch() {},
-  onItemRemoved() {},
-  onItemChanged() {},
-  onItemVisited() {},
-  onItemMoved(aItemId, aOldParent, aOldIndex, aNewParent, aNewIndex, aItemType,
-              aGuid, aOldParentGuid, aNewParentGuid) {
-    this._autoshow(aNewParentGuid);
-  },
-
-  _autoshow(aParentGuid) {
-    if (aParentGuid != PlacesUtils.bookmarks.toolbarGuid)
-      return;
-
-    let toolbar = document.getElementById("PersonalToolbar");
-    if (!toolbar.collapsed)
-      return;
-
-    let placement = CustomizableUI.getPlacementOfWidget("personal-bookmarks");
-    let area = placement && placement.area;
-    if (area != CustomizableUI.AREA_BOOKMARKS)
-      return;
-
-    setToolbarVisibility(toolbar, true);
-  }
-};
-

--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1183,17 +1183,16 @@ var gBrowserInit = {
         !focusAndSelectUrlBar()) {
       gBrowser.selectedBrowser.focus();
     }
 
     // Enable/Disable auto-hide tabbar
     gBrowser.tabContainer.updateVisibility();
 
     BookmarkingUI.init();
-    AutoShowBookmarksToolbar.init();
 
     gPrefService.addObserver(gHomeButton.prefDomain, gHomeButton, false);
 
     var homeButton = document.getElementById("home-button");
     gHomeButton.updateTooltip(homeButton);
 
     let safeMode = document.getElementById("helpSafeMode");
     if (Services.appinfo.inSafeMode) {
@@ -1418,16 +1417,18 @@ var gBrowserInit = {
     try {
       gBrowser.removeProgressListener(window.XULBrowserWindow);
       gBrowser.removeTabsProgressListener(window.TabsProgressListener);
     } catch (ex) {
     }
 
     PlacesToolbarHelper.uninit();
 
+    BookmarkingUI.uninit();
+
     TabsInTitlebar.uninit();
 
     ToolbarIconColor.uninit();
 
     TabletModeUpdater.uninit();
 
     gTabletModePageCounter.finish();
 
@@ -1478,18 +1479,16 @@ var gBrowserInit = {
         this.gmpInstallManager.uninit();
       }
 
       BrowserOffline.uninit();
       OfflineApps.uninit();
       IndexedDBPromptHelper.uninit();
       LightweightThemeListener.uninit();
       PanelUI.uninit();
-      BookmarkingUI.uninit();
-      AutoShowBookmarksToolbar.uninit();
     }
 
     // Final window teardown, do this last.
     window.XULBrowserWindow = null;
     window.QueryInterface(Ci.nsIInterfaceRequestor)
           .getInterface(Ci.nsIWebNavigation)
           .QueryInterface(Ci.nsIDocShellTreeItem).treeOwner
           .QueryInterface(Ci.nsIInterfaceRequestor)