diff --git a/extra/firefox/files/mozconfig b/extra/firefox/files/mozconfig
index bddf7b4d..1fa82e84 100644
--- a/extra/firefox/files/mozconfig
+++ b/extra/firefox/files/mozconfig
@@ -42,14 +42,15 @@ ac_add_options --enable-alsa
 ac_add_options --disable-startup-notification
 
 # Respect the user.
-export MOZ_SERVICES_METRICS=0
-export MOZ_PAY=0
-export MOZ_SERVICES_HEALTHREPORTER=0
-export MOZ_SERVICES_FXACCOUNTS=0
-export MOZ_SERVICES_METRICS=0
-export MOZ_DATA_REPORTING=0
-export MOZ_DEVICES=0
-export MOZ_REQUIRE_SIGNING=0
+ac_add_options MOZ_SERVICES_METRICS=
+ac_add_options MOZ_PAY=
+ac_add_options MOZ_SERVICES_HEALTHREPORTER=
+ac_add_options MOZ_SERVICES_FXACCOUNTS=
+ac_add_options MOZ_SERVICES_METRICS=
+ac_add_options MOZ_DATA_REPORTING=
+ac_add_options MOZ_DEVICES=
+ac_add_options MOZ_REQUIRE_SIGNING=
+ac_add_options MOZ_TELEMETRY_REPORTING=
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-dbus
diff --git a/extra/firefox/files/vendor.js b/extra/firefox/files/vendor.js
index 282a2d02..1b85caaa 100644
--- a/extra/firefox/files/vendor.js
+++ b/extra/firefox/files/vendor.js
@@ -206,7 +206,6 @@ pref("media.gmp-manager.url", "");
 // Firefox connects to cloudfront on startup unless
 // these are false/blank.
 pref("browser.selfsupport.url",	"");
-pref("keyword.enabled", false);
 
 //
 // "SAFE" BROWSING