From 43ab8a64f8175c992cdd5805d15d2f26e82c8d8a Mon Sep 17 00:00:00 2001
From: Jorg K <jorgk@jorgk.com>
Date: Wed, 20 Dec 2017 22:26:27 +0100
Subject: [PATCH] Backed out changeset 8ccb4ed89302 (bug 1414398). a=jorgk

--HG--
extra : rebase_source : 6ecb4575906b6af38bc81e4eb633ec91d673e012
---
 common/src/extensionSupport.jsm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/src/extensionSupport.jsm b/common/src/extensionSupport.jsm
index cdfcf11162..6d268bb149 100644
--- a/common/src/extensionSupport.jsm
+++ b/common/src/extensionSupport.jsm
@@ -119,9 +119,8 @@ function extensionDefaults() {
     let count = 0;
     AddonManager.getAddonsByTypes(["extension"], (addons) => {
       for (let addon of addons) {
-        if (!addon.userDisabled && !addon.appDisabled && !addon.softDisabled &&
-            // Skip bootstrapped add-ons.
-            addon.operationsRequiringRestart != AddonManager.OP_NEEDS_RESTART_NONE) {
+        if (!addon.userDisabled && !addon.appDisabled && !addon.softDisabled) {
+          // XXX TODO: Skip bootstrapped add-ons here.
           loadAddonPrefs(addon);
         }
       }