diff --git a/mozilla/browser/components/prefwindow/content/nsPrefWindow.js b/mozilla/browser/components/prefwindow/content/nsPrefWindow.js
index 6365d3f8851..b445b85fc46 100644
--- a/mozilla/browser/components/prefwindow/content/nsPrefWindow.js
+++ b/mozilla/browser/components/prefwindow/content/nsPrefWindow.js
@@ -197,12 +197,12 @@ nsPrefWindow.prototype =
                         var elt = itemObject.localname;
                         var prefattribute = itemObject.prefattribute;
                         if (!prefattribute) {
-                          if (elt == "radiogroup" || elt == "textbox" || elt == "menulist")
-                            prefattribute = "value";
-                          else if (elt == "checkbox")
+                          if (elt == "checkbox")
                             prefattribute = "checked";
                           else if (elt == "button")
                             prefattribute = "disabled";
+                          else
+                            prefattribute = "value";
                         }
                         
                         var value = itemObject[prefattribute];
@@ -328,12 +328,12 @@ nsPrefWindow.prototype =
                     var prefdefval    = prefElements[i].getAttribute( "prefdefval" );
                     var prefattribute = prefElements[i].getAttribute( "prefattribute" );
                     if (!prefattribute) {
-                      if (elt == "radiogroup" || elt == "textbox" || elt == "menulist")
-                        prefattribute = "value";
-                      else if (elt == "checkbox")
+                      if (elt == "checkbox")
                         prefattribute = "checked";
                       else if (elt == "button")
                         prefattribute = "disabled";
+                      else
+                        prefattribute = "value";
                     }
                     var prefvalue = this.getPref( preftype, prefstring );
                     if( prefvalue == "!/!ERROR_UNDEFINED_PREF!/!" )
diff --git a/mozilla/browser/components/prefwindow/content/pref-connection.xul b/mozilla/browser/components/prefwindow/content/pref-connection.xul
index 4d024c41251..27dc5a031a3 100644
--- a/mozilla/browser/components/prefwindow/content/pref-connection.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-connection.xul
@@ -92,7 +92,7 @@
               <!-- gopher port doesn't have an accesskey because the window needs a redesign - bbaetz -->
               <label value="&port.label;" accesskey="&gopherPort.accesskey;" control="networkProxyGopher_Port"/>
               <textbox id="networkProxyGopher_Port" preftype="int" prefstring="network.proxy.gopher_port"
-                         prefattribute="value" size="5"/>
+                       size="5"/>
             </hbox>
           </row>
           <row align="center">
diff --git a/mozilla/browser/components/prefwindow/content/pref-features.xul b/mozilla/browser/components/prefwindow/content/pref-features.xul
index 2eb09fbeea0..3cda79f1359 100644
--- a/mozilla/browser/components/prefwindow/content/pref-features.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-features.xul
@@ -116,7 +116,7 @@
                   accesskey="&forOriginatingSiteOnly.accesskey;"
                   oncommand="updateImagePref()"
                   style="margin-left: 23px;"/>
-        <data id="enableImagePref" preftype="int" prefstring="network.image.imageBehavior" prefattribute="value" wsm_attributes="value"/>
+        <data id="enableImagePref" preftype="int" prefstring="network.image.imageBehavior"/>
       </vbox>
       <vbox>
         <button id="manageImages" class="uniWidthButton"
diff --git a/mozilla/browser/components/prefwindow/content/pref-fonts.xul b/mozilla/browser/components/prefwindow/content/pref-fonts.xul
index 2981eb61adc..f70f45f22ac 100644
--- a/mozilla/browser/components/prefwindow/content/pref-fonts.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-fonts.xul
@@ -64,8 +64,7 @@
                control="selectLangs"/>
       </hbox>
       <menulist id="selectLangs" oncommand="selectLanguage();"
-                preftype="localizedstring" prefstring="font.language.group"
-                wsm_attributes="value">
+                preftype="localizedstring" prefstring="font.language.group">
         <menupopup>
           <menuitem value="x-western" label="&font.langGroup.latin1;"/>
           <menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
@@ -282,13 +281,13 @@
         <label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
         <spacer flex="1"/>
         <colorpicker type="button" id="foregroundtextmenu" palettename="standard"/> 
-        <data id="foregroundText" preftype="color" prefstring="browser.display.foreground_color" prefattribute="value" wsm_attributes="value"/>
+        <data id="foregroundText" preftype="color" prefstring="browser.display.foreground_color"/>
       </hbox>
       <hbox align="center" style="margin-top: 5px">
         <label value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" control="backgroundmenu"/>
         <spacer flex="1"/>
         <colorpicker type="button" id="backgroundmenu" palettename="standard"/> 
-        <data id="background" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
+        <data id="background" preftype="color" prefstring="browser.display.background_color"/>
       </hbox>
       <separator class="thin"/>
       <hbox align="center">
@@ -303,13 +302,13 @@
         <label value="&linkColor.label;" accesskey="&linkColor.accesskey;" control="unvisitedlinkmenu"/>
         <spacer flex="1"/>
         <colorpicker type="button" id="unvisitedlinkmenu" palettename="standard"/> 
-        <data id="unvisitedLinks" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
+        <data id="unvisitedLinks" preftype="string" prefstring="browser.anchor_color"/>
       </hbox>
       <hbox align="center" style="margin-top: 5px">
         <label value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" control="visitedlinkmenu"/>
         <spacer flex="1"/>
         <colorpicker type="button" id="visitedlinkmenu" palettename="standard"/> 
-        <data id="visitedLinks" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
+        <data id="visitedLinks" preftype="string" prefstring="browser.visited_color"/>
       </hbox>
       <separator class="thin"/>
       <hbox align="center">