Backed out changeset 527790e669cf (bug 1381953) for failures in browser_privacyPreferences.js a=backout

MozReview-Commit-ID: 1eNOikvGo87

browser/app/profile/firefox.js

@@ -730,7 +730,11 @@ pref("browser.preferences.instantApply", true);
 pref("browser.preferences.search", true);
 
 // Use the new in-content about:preferences in Nightly only for now
+#if defined(NIGHTLY_BUILD)
+pref("browser.preferences.useOldOrganization", false);
+#else
 pref("browser.preferences.useOldOrganization", true);
+#endif
 
 // Once the Storage Management is completed.
 // (The Storage Management-related prefs are browser.storageManager.* )