Backed out changeset 4e7c76b2f167 (bug 1332692)

MozReview-Commit-ID: HJXPGUlNhTo

browser/extensions/e10srollout/bootstrap.js

@@ -69,13 +69,9 @@ function defineCohort() {
     // This is also the proper place to set the blocklist pref
     // in case it is necessary.
 
+    // Tab Mix Plus exception tracked at bug 1185672.
     Preferences.set(PREF_E10S_ADDON_BLOCKLIST,
-                    // bug 1185672 - Tab Mix Plus
-                    "{dc572301-7619-498c-a57d-39143191b318};" +
-                    // bug 1332692 - LastPass and Amazon Assistant
-                    "support@lastpass.com;" +
-                    "abb@amazon.com;" +
-                    "abb-acer@amazon.com;");
+                    "{dc572301-7619-498c-a57d-39143191b318}");
   } else {
     Preferences.reset(PREF_E10S_ADDON_POLICY);
   }

browser/extensions/e10srollout/install.rdf.in

@@ -10,7 +10,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>e10srollout@mozilla.org</em:id>
-    <em:version>1.8</em:version>
+    <em:version>1.7</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>