4 files changed, 1 insertions, 14 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 40ceb15ba..41b398efc 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -187,13 +187,6 @@ MOZ_SAFE_BROWSING:
   false,
 #endif
 
-  MOZ_SYSTEM_NSS:
-#ifdef MOZ_SYSTEM_NSS
-  true,
-#else
-  false,
-#endif
-
   MOZ_PLACES:
 #ifdef MOZ_PLACES
   true,
diff --git a/toolkit/modules/addons/.eslintrc.js b/toolkit/modules/addons/.eslintrc.js
index 019759c87..32c92be0a 100644
--- a/toolkit/modules/addons/.eslintrc.js
+++ b/toolkit/modules/addons/.eslintrc.js
@@ -8,7 +8,6 @@ module.exports = { // eslint-disable-line no-undef
     "addMessageListener": false,
     "removeEventListener": false,
     "sendAsyncMessage": false,
-    "AddonManagerPermissions": false,
 
     "initialProcessData": true,
   },
diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm
index c720dae5d..76114d7ba 100644
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -720,11 +720,7 @@ HttpObserverManager = {
         try {
           let result = callback(data);
 
-          if (result && typeof result === "object" && opts.blocking
-              && !AddonManagerPermissions.isHostPermitted(uri.host)
-              && (!loadInfo || !loadInfo.loadingPrincipal
-                  || !loadInfo.loadingPrincipal.URI
-                  || !AddonManagerPermissions.isHostPermitted(loadInfo.loadingPrincipal.URI.host))) {
+          if (result && typeof result === "object" && opts.blocking) {
             handlerResults.push({opts, result});
           }
         } catch (e) {
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 4e647bd7f..6b181b6aa 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -148,7 +148,6 @@ for var in ('ANDROID_PACKAGE_NAME',
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_TOOLKIT_SEARCH',
-            'MOZ_SYSTEM_NSS',
             'MOZ_UPDATER',
             'MOZ_SWITCHBOARD'):
     if CONFIG[var]: