Backing that out. <sigh>. Trunk, branch. Branch, trunk. How hard can it be?

modules/libpref/src/init/config.js

@@ -23,7 +23,7 @@
 // Default configuration information for the client
 //
 
-config("startup.homepage_override_url.1","chrome://navigator-region/locale/region.properties");
+config("startup.homepage_override_url","chrome://navigator-region/locale/region.properties");
 config("autoadmin.append_emailaddr",false);
 config("autoadmin.failover_to_cached",true);
 

xpfe/browser/src/nsBrowserInstance.cpp

@@ -156,7 +156,7 @@ static int APP_DEBUG = 0; // Set to 1 in debugger to turn on debugging.
 #endif                                                                 
 
 
-#define PREF_HOMEPAGE_OVERRIDE_URL "startup.homepage_override_url.1"
+#define PREF_HOMEPAGE_OVERRIDE_URL "startup.homepage_override_url"
 #define PREF_HOMEPAGE_OVERRIDE "browser.startup.homepage_override.1"
 #define PREF_HOMEPAGE_OVERRIDE_MSTONE "browser.startup.homepage_override.mstone"
 #define PREF_BROWSER_STARTUP_PAGE "browser.startup.page"