backing out fix for bug #373944 as it causes a performance regression, see bug #385208

browser/components/places/content/moveBookmarks.js

@@ -51,9 +51,12 @@ 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
-    this.foldersTree.selectFolders([PlacesUtils.bookmarksRootId]);
+        aSelf.foldersTree.selectFolders([PlacesUtils.bookmarksRootId]);
-    this.foldersTree.selectedNode.containerOpen = true;
+        aSelf.foldersTree.selectedNode.containerOpen = true;
+      }, 0, this);
   },
 
   onOK: function MBD_onOK(aEvent) {

browser/components/places/content/places.js

@@ -54,6 +54,13 @@ 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");
 

browser/components/places/content/tree.xml

@@ -50,7 +50,13 @@
         this.controllers.appendController(this._controller);
 
         // Force an initial build. 
-        this.place = this.place;
+        // 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);
+        }
       ]]></constructor>
 
       <destructor><![CDATA[