--- a/caps/nsPrincipal.cpp
+++ b/caps/nsPrincipal.cpp
@@ -29,19 +29,17 @@
 #include "mozilla/HashFunctions.h"
 
 #include "nsIAppsService.h"
 #include "mozIApplication.h"
 
 using namespace mozilla;
 
 static bool gIsWhitelistingTestDomains = false;
-// XXXdholbert Add to InitializeStatics():
 static bool gCodeBasePrincipalSupport = false;
-static bool gIsObservingCodeBasePrincipalSupport = false;
 
 static bool URIIsImmutable(nsIURI* aURI)
 {
   nsCOMPtr<nsIMutable> mutableObj(do_QueryInterface(aURI));
   bool isMutable;
   return
     mutableObj &&
     NS_SUCCEEDED(mutableObj->GetMutable(&isMutable)) &&
@@ -71,25 +69,16 @@ nsBasePrincipal::Release()
     delete this;
   }
 
   return count;
 }
 
 nsBasePrincipal::nsBasePrincipal()
 {
-  if (!gIsObservingCodeBasePrincipalSupport) {
-    nsresult rv =
-      Preferences::AddBoolVarCache(&gCodeBasePrincipalSupport,
-                                   "signed.applets.codebase_principal_support",
-                                   false);
-    gIsObservingCodeBasePrincipalSupport = NS_SUCCEEDED(rv);
-    NS_WARN_IF_FALSE(gIsObservingCodeBasePrincipalSupport,
-                     "Installing gCodeBasePrincipalSupport failed!");
-  }
 }
 
 nsBasePrincipal::~nsBasePrincipal(void)
 {
 }
 
 NS_IMETHODIMP
 nsBasePrincipal::GetCsp(nsIContentSecurityPolicy** aCsp)
@@ -132,16 +121,20 @@ NS_IMPL_RELEASE_INHERITED(nsPrincipal, n
 
 // Called at startup:
 /* static */ void
 nsPrincipal::InitializeStatics()
 {
   Preferences::AddBoolVarCache(
     &gIsWhitelistingTestDomains,
     "layout.css.unprefixing-service.include-test-domains");
+
+  Preferences::AddBoolVarCache(&gCodeBasePrincipalSupport,
+                               "signed.applets.codebase_principal_support",
+                               false);
 }
 
 nsPrincipal::nsPrincipal()
   : mAppId(nsIScriptSecurityManager::UNKNOWN_APP_ID)
   , mInMozBrowser(false)
   , mCodebaseImmutable(false)
   , mDomainImmutable(false)
   , mInitialized(false)