diff --git a/mozilla/toolkit/content/widgets/toolbar.xml b/mozilla/toolkit/content/widgets/toolbar.xml
index f82a8771467..d45fea492a9 100644
--- a/mozilla/toolkit/content/widgets/toolbar.xml
+++ b/mozilla/toolkit/content/widgets/toolbar.xml
@@ -35,26 +35,18 @@
           ]]>
         </body>
       </method>
-      <method name="foopy">
-        <body>
-        <![CDATA[
-          setTimeout(this.buildItemsFromPalette, 0, this);
-          ]]>
-          </body>
-          </method>
       <method name="buildItemsFromPalette">
-        <parameter name="aThis"/>
         <body>
           <![CDATA[
-            var currentSet = aThis.getAttribute("currentset");
+            var currentSet = this.getAttribute("currentset");
             if (!currentSet)
-              currentSet = aThis.getAttribute("defaultset");
+              currentSet = this.getAttribute("defaultset");
             if (!currentSet)
               return;
 
-            var node = aThis.palette ? aThis.palette : aThis.firstChild;
+            var node = this.palette ? this.palette : this.firstChild;
               
-            if (!aThis.palette) {
+            if (!this.palette) {
               while (node) {
                 if (node.localName == "toolbarpalette")
                   break;
@@ -63,9 +55,9 @@
               if (!node)
                 return;
             
-              aThis.afterPalette = node.nextSibling;
-              aThis.palette = node;
-              aThis.removeChild(node);
+              this.afterPalette = node.nextSibling;
+              this.palette = node;
+              this.removeChild(node);
             }
             
             var items = currentSet.split(",");
@@ -77,7 +69,7 @@
                 var sep = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
                                                    "toolbarseparator");
                 sep.id = "separator";
-                aThis.insertBefore(sep, aThis.afterPalette);
+                this.insertBefore(sep, this.afterPalette);
                 continue;
               }
 
@@ -88,7 +80,7 @@
                 if (paletteID == item) {
                   var newItem = paletteItem.cloneNode(true);
                   newItem.hidden = true;
-                  aThis.insertBefore(newItem, aThis.afterPalette);
+                  this.insertBefore(newItem, this.afterPalette);
                   newItem.hidden = false;
                   break;
                 }
@@ -101,7 +93,7 @@
       </method>
       <constructor>
         <![CDATA[
-          this.foopy();
+          this.buildItemsFromPalette();
         ]]>
       </constructor>
     </implementation>
