diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index 2aa795736..574ca972d 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -1435,27 +1435,6 @@ BrowserGlue.prototype = {
       Services.prefs.clearUserPref("security.cert_pinning.enforcement_level");
     }
 
-    if (currentUIVersion < 21) {
-      // Remove key4.db and cert9.db if those files exist
-      // XXX: Remove this code block once we actually start using them.
-      let dsCertFile = Cc["@mozilla.org/file/directory_service;1"]
-                    .getService(Ci.nsIProperties)
-                    .get("ProfD", Ci.nsIFile);
-      dsKeyFile = dsCertFile.clone();
-      dsCertFile.append("cert9.db");
-      if (dsCertFile.exists()) {
-        try {
-          dsCertFile.remove(false);
-        } catch(e) { }
-      }
-      dsKeyFile.append("key4.db");
-      if (dsKeyFile.exists()) {
-        try {
-          dsKeyFile.remove(false);
-        } catch(e) { }
-      }
-    }
-
     if (currentUIVersion < 23) {
       if (Services.prefs.prefHasUserValue("layers.acceleration.disabled")) {
         let HWADisabled = Services.prefs.getBoolPref("layers.acceleration.disabled");
diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh
index c7f44b96b..156cb886d 100644
--- a/application/palemoon/confvars.sh
+++ b/application/palemoon/confvars.sh
@@ -46,6 +46,9 @@ MOZ_PHOENIX=1
 # Lightweight Themes
 MOZ_PERSONAS=1
 
+# Enable SQL storage format for certs and passwords in NSS
+MOZ_SECURITY_SQLSTORE=1
+
 # Browser Feature: Profile Migration Component
 MOZ_PROFILE_MIGRATOR=
 
@@ -94,4 +97,4 @@ if test "$OS_ARCH" = "WINNT" -o \
 fi
 
 # Short-circuit a few services to be removed
-MOZ_SERVICES_HEALTHREPORT=
\ No newline at end of file
+MOZ_SERVICES_HEALTHREPORT=