diff --git a/mozilla/browser/components/places/content/moveBookmarks.js b/mozilla/browser/components/places/content/moveBookmarks.js
index a1ecdd2d7fd..1d7d2bea3dc 100644
--- a/mozilla/browser/components/places/content/moveBookmarks.js
+++ b/mozilla/browser/components/places/content/moveBookmarks.js
@@ -52,12 +52,9 @@ var gMoveBookmarksDialog = {
     this._nodes = window.arguments[0];
     this._tm = window.arguments[1];
 
-    // setTimeout until bug 373944 is fixed
-    setTimeout(function(aSelf) {
-        // select and expand the root node
-        aSelf.foldersTree.selectFolders([PlacesUtils.bookmarksRootId]);
-        aSelf.foldersTree.selectedNode.containerOpen = true;
-      }, 0, this);
+    // select and expand the root node
+    this.foldersTree.selectFolders([PlacesUtils.bookmarksRootId]);
+    this.foldersTree.selectedNode.containerOpen = true;
   },
 
   onOK: function MBD_onOK(aEvent) {
diff --git a/mozilla/browser/components/places/content/places.js b/mozilla/browser/components/places/content/places.js
index 15f5001856f..fef15dc7a6a 100755
--- a/mozilla/browser/components/places/content/places.js
+++ b/mozilla/browser/components/places/content/places.js
@@ -54,13 +54,6 @@ var PlacesOrganizer = {
   _content: null,
 
   init: function PO_init() {
-    var self = this;
-    // on timeout because of the corresponding setTimeout()
-    // in the places tree binding's constructor
-    setTimeout(function() { self._init(); }, 0);
-  },
-
-  _init: function PO__init() {
     this._places = document.getElementById("placesList");
     this._content = document.getElementById("placeContent");
 
diff --git a/mozilla/browser/components/places/content/tree.xml b/mozilla/browser/components/places/content/tree.xml
index 972501c14d2..3404dfd124a 100644
--- a/mozilla/browser/components/places/content/tree.xml
+++ b/mozilla/browser/components/places/content/tree.xml
@@ -49,14 +49,9 @@
         this._controller = new PlacesController(this);
         this.controllers.appendController(this._controller);
 
-        // Force an initial build. 
-        // but do it on setTimeout() for bugs #373719 and bug #373721
-        // caused by a change for bug #267833
-        // note the corresponding setTimeout() in PO_init()
-        if (this.place) {
-          var self = this;
-          setTimeout(function() { self.place = self.place; }, 0);
-        }
+        // Force an initial build.
+        if (this.place)
+          this.place = this.place;
       ]]></constructor>
 
       <destructor><![CDATA[
@@ -156,7 +151,8 @@
           if (this.showRoot != val) {
             this.setAttribute("showRoot", val);
             // reload with the last place set
-            this.place = this.place;
+            if (this.place)
+              this.place = this.place;
           }
           return val;
         ]]></setter>