From f7650958c8407eb821145d23a75c07fcd6d7c622 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Mon, 6 Jun 2022 04:42:06 +0000
Subject: [PATCH] Bug 1772313 - Part 7: Stop calling
 XPCOMUtils.defineLazyModuleGetters for Services.
 r=kmag,webdriver-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D148160
---
 browser/actors/AboutPrivateBrowsingChild.jsm              | 3 ++-
 browser/actors/SearchSERPTelemetryChild.jsm               | 2 +-
 browser/components/aboutlogins/AboutLoginsParent.jsm      | 2 +-
 browser/components/doh/DoHConfig.jsm                      | 2 +-
 browser/components/downloads/DownloadsTaskbar.jsm         | 2 +-
 browser/components/firefoxview/recently-closed-tabs.js    | 2 +-
 browser/components/migration/ChromeMigrationUtils.jsm     | 2 +-
 browser/components/migration/ChromeProfileMigrator.jsm    | 2 +-
 .../newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm      | 2 +-
 .../newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm     | 2 +-
 browser/components/newtab/lib/InfoBar.jsm                 | 2 +-
 browser/components/newtab/lib/MomentsPageHub.jsm          | 2 +-
 .../components/newtab/lib/OnboardingMessageProvider.jsm   | 2 +-
 browser/components/newtab/lib/RemoteL10n.jsm              | 8 +-------
 browser/components/newtab/lib/TippyTopProvider.jsm        | 5 +----
 browser/components/newtab/lib/ToolbarBadgeHub.jsm         | 2 +-
 browser/components/newtab/lib/ToolbarPanelHub.jsm         | 2 +-
 browser/components/pagedata/PageDataSchema.jsm            | 2 +-
 browser/components/pagedata/PageDataService.jsm           | 2 +-
 browser/components/pagedata/tests/unit/head.js            | 2 +-
 browser/components/places/Interactions.jsm                | 2 +-
 browser/components/places/InteractionsBlocklist.jsm       | 2 +-
 browser/components/places/SnapshotGroups.jsm              | 2 +-
 browser/components/places/SnapshotMonitor.jsm             | 2 +-
 browser/components/places/SnapshotScorer.jsm              | 2 +-
 browser/components/places/SnapshotSelector.jsm            | 2 +-
 browser/components/places/Snapshots.jsm                   | 2 +-
 .../places/tests/unit/interactions/head_interactions.js   | 2 +-
 browser/components/search/BrowserSearchTelemetry.jsm      | 2 +-
 browser/components/search/SearchOneOffs.jsm               | 2 +-
 browser/components/search/SearchSERPTelemetry.jsm         | 2 +-
 browser/components/search/test/unit/test_urlTelemetry.js  | 2 +-
 .../search/test/unit/test_urlTelemetry_generic.js         | 2 +-
 browser/components/touchbar/MacTouchBar.js                | 2 +-
 browser/components/uitour/UITour.jsm                      | 2 +-
 browser/components/urlbar/UrlbarEventBufferer.jsm         | 2 +-
 browser/components/urlbar/UrlbarInput.jsm                 | 2 +-
 browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm  | 2 +-
 browser/components/urlbar/UrlbarProviderExtension.jsm     | 2 +-
 .../components/urlbar/UrlbarProviderHeuristicFallback.jsm | 2 +-
 browser/components/urlbar/UrlbarProviderInterventions.jsm | 2 +-
 .../components/urlbar/UrlbarProviderPreloadedSites.jsm    | 2 +-
 browser/components/urlbar/UrlbarProviderPrivateSearch.jsm | 2 +-
 browser/components/urlbar/UrlbarProviderQuickSuggest.jsm  | 2 +-
 browser/components/urlbar/UrlbarProviderRemoteTabs.jsm    | 2 +-
 .../components/urlbar/UrlbarProviderSearchSuggestions.jsm | 2 +-
 browser/components/urlbar/UrlbarProviderSearchTips.jsm    | 2 +-
 browser/components/urlbar/UrlbarProviderTabToSearch.jsm   | 2 +-
 browser/components/urlbar/UrlbarProviderTopSites.jsm      | 2 +-
 browser/components/urlbar/UrlbarQuickSuggest.jsm          | 2 +-
 browser/components/urlbar/UrlbarSearchOneOffs.jsm         | 2 +-
 browser/components/urlbar/UrlbarTokenizer.jsm             | 2 +-
 browser/components/urlbar/UrlbarUtils.jsm                 | 2 +-
 browser/components/urlbar/UrlbarValueFormatter.jsm        | 2 +-
 browser/components/urlbar/UrlbarView.jsm                  | 2 +-
 browser/components/urlbar/tests/UrlbarTestUtils.jsm       | 2 +-
 .../urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm   | 2 +-
 browser/components/urlbar/tests/unit/head.js              | 2 +-
 browser/modules/AppUpdater.jsm                            | 2 +-
 browser/modules/AsyncTabSwitcher.jsm                      | 2 +-
 browser/modules/BrowserUsageTelemetry.jsm                 | 2 +-
 browser/modules/ExtensionsUI.jsm                          | 2 +-
 browser/modules/HomePage.jsm                              | 2 +-
 browser/modules/PageActions.jsm                           | 2 +-
 browser/modules/PartnerLinkAttribution.jsm                | 2 +-
 browser/modules/test/unit/test_HomePage.js                | 2 +-
 browser/modules/test/unit/test_HomePage_ignore.js         | 2 +-
 browser/themes/BuiltInThemes.jsm                          | 2 +-
 docshell/test/unit/head_docshell.js                       | 2 +-
 dom/push/test/xpcshell/head.js                            | 2 +-
 remote/cdp/CDPConnection.jsm                              | 3 +--
 remote/cdp/Error.jsm                                      | 3 +--
 remote/cdp/JSONHandler.jsm                                | 3 +--
 remote/cdp/StreamRegistry.jsm                             | 2 +-
 remote/cdp/domains/content/Log.jsm                        | 5 ++---
 remote/cdp/domains/content/Runtime.jsm                    | 4 ++--
 remote/cdp/domains/parent/Browser.jsm                     | 2 +-
 remote/cdp/domains/parent/Input.jsm                       | 3 +--
 remote/cdp/domains/parent/Network.jsm                     | 2 +-
 remote/cdp/domains/parent/Page.jsm                        | 4 ++--
 remote/cdp/domains/parent/Target.jsm                      | 2 +-
 remote/cdp/domains/parent/page/DialogHandler.jsm          | 4 ++--
 remote/cdp/observers/ChannelEventSink.jsm                 | 4 ++--
 remote/cdp/observers/ContextObserver.jsm                  | 2 +-
 remote/cdp/observers/NetworkObserver.jsm                  | 2 +-
 remote/cdp/observers/TargetObserver.jsm                   | 2 +-
 remote/cdp/targets/Target.jsm                             | 2 +-
 remote/components/RemoteAgent.jsm                         | 3 +--
 remote/marionette/actors/MarionetteCommandsChild.jsm      | 3 +--
 remote/marionette/actors/MarionetteEventsChild.jsm        | 3 +--
 remote/marionette/actors/MarionetteEventsParent.jsm       | 3 +--
 remote/marionette/appinfo.js                              | 5 +----
 remote/marionette/driver.js                               | 3 +--
 remote/marionette/element.js                              | 2 +-
 remote/marionette/event.js                                | 2 +-
 remote/marionette/modal.js                                | 2 +-
 remote/server/WebSocketHandshake.jsm                      | 3 +--
 remote/shared/Format.jsm                                  | 3 +--
 remote/shared/RecommendedPreferences.jsm                  | 2 +-
 remote/shared/Sync.jsm                                    | 5 ++---
 remote/shared/TabManager.jsm                              | 5 ++---
 remote/shared/WebSocketConnection.jsm                     | 3 +--
 remote/shared/WindowManager.jsm                           | 3 +--
 remote/shared/listeners/BrowsingContextListener.jsm       | 2 +-
 remote/shared/listeners/ConsoleListener.jsm               | 2 +-
 remote/shared/messagehandler/ModuleCache.jsm              | 3 +--
 remote/shared/messagehandler/sessiondata/SessionData.jsm  | 3 +--
 .../messagehandler/sessiondata/SessionDataReader.jsm      | 3 +--
 remote/shared/webdriver/Capabilities.jsm                  | 2 +-
 remote/shared/webdriver/Session.jsm                       | 3 +--
 remote/webdriver-bidi/modules/root/browsingContext.jsm    | 3 +--
 testing/specialpowers/content/AppTestDelegateParent.jsm   | 2 +-
 toolkit/components/crashes/CrashManagerTest.jsm           | 2 +-
 toolkit/components/downloads/DownloadCore.jsm             | 2 +-
 toolkit/components/downloads/DownloadHistory.jsm          | 2 +-
 toolkit/components/downloads/test/unit/head.js            | 2 +-
 toolkit/components/extensions/ExtensionPermissions.jsm    | 2 +-
 toolkit/components/extensions/ExtensionStorageIDB.jsm     | 2 +-
 .../components/extensions/ExtensionStorageSyncKinto.jsm   | 2 +-
 toolkit/components/extensions/NativeManifests.jsm         | 2 +-
 toolkit/components/extensions/NativeMessaging.jsm         | 2 +-
 toolkit/components/extensions/ext-browser-content.js      | 2 +-
 .../components/messaging-system/targeting/Targeting.jsm   | 2 +-
 toolkit/components/nimbus/lib/ExperimentManager.jsm       | 2 +-
 .../components/normandy/actions/AddonRolloutAction.jsm    | 2 +-
 .../normandy/actions/BranchedAddonStudyAction.jsm         | 2 +-
 toolkit/components/normandy/lib/ShieldPreferences.jsm     | 2 +-
 toolkit/components/passwordmgr/LoginCSVImport.jsm         | 2 +-
 toolkit/components/passwordmgr/LoginExport.jsm            | 2 +-
 toolkit/components/places/History.jsm                     | 2 +-
 toolkit/components/places/PlacesPreviews.jsm              | 2 +-
 toolkit/components/places/PlacesUtils.jsm                 | 2 +-
 toolkit/components/places/tests/chrome/head.js            | 2 +-
 toolkit/components/satchel/test/unit/head_satchel.js      | 2 +-
 toolkit/components/search/OpenSearchEngine.jsm            | 2 +-
 toolkit/components/search/SearchEngine.jsm                | 2 +-
 toolkit/components/search/SearchEngineSelector.jsm        | 2 +-
 toolkit/components/search/SearchService.jsm               | 2 +-
 toolkit/components/search/SearchSettings.jsm              | 2 +-
 toolkit/components/search/SearchSuggestionController.jsm  | 2 +-
 toolkit/components/search/SearchUtils.jsm                 | 5 +----
 toolkit/components/search/tests/SearchTestUtils.jsm       | 2 +-
 .../tests/xpcshell/searchconfigs/head_searchconfig.js     | 2 +-
 .../components/taskscheduler/TaskSchedulerMacOSImpl.jsm   | 2 +-
 toolkit/components/telemetry/pings/UninstallPing.jsm      | 2 +-
 .../components/telemetry/pings/UntrustedModulesPing.jsm   | 2 +-
 .../telemetry/tests/unit/TelemetryEnvironmentTesting.jsm  | 2 +-
 toolkit/components/thumbnails/PageThumbs.jsm              | 2 +-
 toolkit/modules/AsanReporter.jsm                          | 2 +-
 toolkit/modules/OsEnvironment.jsm                         | 2 +-
 toolkit/modules/Region.jsm                                | 2 +-
 toolkit/modules/Sqlite.jsm                                | 2 +-
 toolkit/modules/UpdateUtils.jsm                           | 2 +-
 toolkit/modules/subprocess/test/xpcshell/head.js          | 2 +-
 toolkit/mozapps/extensions/AbuseReporter.jsm              | 2 +-
 toolkit/mozapps/extensions/internal/AddonRepository.jsm   | 2 +-
 toolkit/mozapps/extensions/internal/GMPProvider.jsm       | 2 +-
 toolkit/mozapps/extensions/internal/XPIDatabase.jsm       | 2 +-
 .../mozapps/update/BackgroundTask_backgroundupdate.jsm    | 2 +-
 toolkit/mozapps/update/BackgroundUpdate.jsm               | 2 +-
 160 files changed, 168 insertions(+), 203 deletions(-)

diff --git a/browser/actors/AboutPrivateBrowsingChild.jsm b/browser/actors/AboutPrivateBrowsingChild.jsm
index df1641ad21c9..a1c7b1daab72 100644
--- a/browser/actors/AboutPrivateBrowsingChild.jsm
+++ b/browser/actors/AboutPrivateBrowsingChild.jsm
@@ -13,10 +13,11 @@ const { RemotePageChild } = ChromeUtils.import(
   "resource://gre/actors/RemotePageChild.jsm"
 );
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 class AboutPrivateBrowsingChild extends RemotePageChild {
diff --git a/browser/actors/SearchSERPTelemetryChild.jsm b/browser/actors/SearchSERPTelemetryChild.jsm
index 9e5118e7d085..3db92844a28c 100644
--- a/browser/actors/SearchSERPTelemetryChild.jsm
+++ b/browser/actors/SearchSERPTelemetryChild.jsm
@@ -8,10 +8,10 @@ var EXPORTED_SYMBOLS = ["SearchSERPTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   clearTimeout: "resource://gre/modules/Timer.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
 
diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 7d605543ddd9..a5bd955aa2a7 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -13,6 +13,7 @@ const { setTimeout, clearTimeout } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -23,7 +24,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   LoginCSVImport: "resource://gre/modules/LoginCSVImport.jsm",
   MigrationUtils: "resource:///modules/MigrationUtils.jsm",
   OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UIState: "resource://services-sync/UIState.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
 });
diff --git a/browser/components/doh/DoHConfig.jsm b/browser/components/doh/DoHConfig.jsm
index 70d34646abe2..cb90f988df2c 100644
--- a/browser/components/doh/DoHConfig.jsm
+++ b/browser/components/doh/DoHConfig.jsm
@@ -15,12 +15,12 @@ var EXPORTED_SYMBOLS = ["DoHConfigController"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   Preferences: "resource://gre/modules/Preferences.jsm",
   Region: "resource://gre/modules/Region.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const kGlobalPrefBranch = "doh-rollout";
diff --git a/browser/components/downloads/DownloadsTaskbar.jsm b/browser/components/downloads/DownloadsTaskbar.jsm
index 0096ebcafbfb..4c50b2757811 100644
--- a/browser/components/downloads/DownloadsTaskbar.jsm
+++ b/browser/components/downloads/DownloadsTaskbar.jsm
@@ -17,10 +17,10 @@ var EXPORTED_SYMBOLS = ["DownloadsTaskbar"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   Downloads: "resource://gre/modules/Downloads.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "gWinTaskbar", function() {
diff --git a/browser/components/firefoxview/recently-closed-tabs.js b/browser/components/firefoxview/recently-closed-tabs.js
index 9c654a82f009..e9b97113fe5f 100644
--- a/browser/components/firefoxview/recently-closed-tabs.js
+++ b/browser/components/firefoxview/recently-closed-tabs.js
@@ -7,8 +7,8 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(globalThis, {
-  Services: "resource://gre/modules/Services.jsm",
   SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
 });
diff --git a/browser/components/migration/ChromeMigrationUtils.jsm b/browser/components/migration/ChromeMigrationUtils.jsm
index 207517dc2362..88c503193d98 100644
--- a/browser/components/migration/ChromeMigrationUtils.jsm
+++ b/browser/components/migration/ChromeMigrationUtils.jsm
@@ -8,12 +8,12 @@ var EXPORTED_SYMBOLS = ["ChromeMigrationUtils"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   LoginHelper: "resource://gre/modules/LoginHelper.jsm",
   MigrationUtils: "resource:///modules/MigrationUtils.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const S100NS_FROM1601TO1970 = 0x19db1ded53e8000;
diff --git a/browser/components/migration/ChromeProfileMigrator.jsm b/browser/components/migration/ChromeProfileMigrator.jsm
index 6babc19c458f..e1c4bfbd72c6 100644
--- a/browser/components/migration/ChromeProfileMigrator.jsm
+++ b/browser/components/migration/ChromeProfileMigrator.jsm
@@ -15,6 +15,7 @@ const AUTH_TYPE = {
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   ChromeMigrationUtils: "resource:///modules/ChromeMigrationUtils.jsm",
@@ -25,7 +26,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   Qihoo360seMigrationUtils: "resource:///modules/360seMigrationUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 /**
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
index 299325c183bd..58fc34b8636b 100644
--- a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
+++ b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
@@ -8,12 +8,12 @@ const EXPORTED_SYMBOLS = ["AboutWelcomeDefaults", "DEFAULT_WELCOME_CONTENT"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   AttributionCode: "resource:///modules/AttributionCode.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const DEFAULT_WELCOME_CONTENT = {
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
index 372b5b7335b8..e756ac7b15b6 100644
--- a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
+++ b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
@@ -7,11 +7,11 @@ const EXPORTED_SYMBOLS = ["AboutWelcomeTelemetry"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PingCentre: "resource:///modules/PingCentre.jsm",
   ClientID: "resource://gre/modules/ClientID.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
   AttributionCode: "resource:///modules/AttributionCode.jsm",
 });
diff --git a/browser/components/newtab/lib/InfoBar.jsm b/browser/components/newtab/lib/InfoBar.jsm
index 99a3cfa12d77..efa2bb4c5422 100644
--- a/browser/components/newtab/lib/InfoBar.jsm
+++ b/browser/components/newtab/lib/InfoBar.jsm
@@ -6,11 +6,11 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 class InfoBarNotification {
diff --git a/browser/components/newtab/lib/MomentsPageHub.jsm b/browser/components/newtab/lib/MomentsPageHub.jsm
index 9fc990a4cae0..4a8460031b33 100644
--- a/browser/components/newtab/lib/MomentsPageHub.jsm
+++ b/browser/components/newtab/lib/MomentsPageHub.jsm
@@ -6,9 +6,9 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   setInterval: "resource://gre/modules/Timer.jsm",
   clearInterval: "resource://gre/modules/Timer.jsm",
 });
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index d77a714dece2..8927b8d5f49e 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -7,9 +7,9 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   ShellService: "resource:///modules/ShellService.jsm",
 });
 
diff --git a/browser/components/newtab/lib/RemoteL10n.jsm b/browser/components/newtab/lib/RemoteL10n.jsm
index 7e7e375db135..e6465137620d 100644
--- a/browser/components/newtab/lib/RemoteL10n.jsm
+++ b/browser/components/newtab/lib/RemoteL10n.jsm
@@ -10,13 +10,7 @@
 const USE_REMOTE_L10N_PREF =
   "browser.newtabpage.activity-stream.asrouter.useRemoteL10n";
 
-const { XPCOMUtils } = ChromeUtils.import(
-  "resource://gre/modules/XPCOMUtils.jsm"
-);
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 /**
  * All supported locales for remote l10n
diff --git a/browser/components/newtab/lib/TippyTopProvider.jsm b/browser/components/newtab/lib/TippyTopProvider.jsm
index 029278bb971f..af7aa5fd0d75 100644
--- a/browser/components/newtab/lib/TippyTopProvider.jsm
+++ b/browser/components/newtab/lib/TippyTopProvider.jsm
@@ -5,10 +5,7 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["fetch", "URL"]);
 
diff --git a/browser/components/newtab/lib/ToolbarBadgeHub.jsm b/browser/components/newtab/lib/ToolbarBadgeHub.jsm
index a2e0b9bd11db..a5cd16026901 100644
--- a/browser/components/newtab/lib/ToolbarBadgeHub.jsm
+++ b/browser/components/newtab/lib/ToolbarBadgeHub.jsm
@@ -6,11 +6,11 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EveryWindow: "resource:///modules/EveryWindow.jsm",
   ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   requestIdleCallback: "resource://gre/modules/Timer.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
diff --git a/browser/components/newtab/lib/ToolbarPanelHub.jsm b/browser/components/newtab/lib/ToolbarPanelHub.jsm
index 2719e48d08e6..6a8b7d7e649c 100644
--- a/browser/components/newtab/lib/ToolbarPanelHub.jsm
+++ b/browser/components/newtab/lib/ToolbarPanelHub.jsm
@@ -6,8 +6,8 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   EveryWindow: "resource:///modules/EveryWindow.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
diff --git a/browser/components/pagedata/PageDataSchema.jsm b/browser/components/pagedata/PageDataSchema.jsm
index 57fd1b4f69c5..71221d1a46c4 100644
--- a/browser/components/pagedata/PageDataSchema.jsm
+++ b/browser/components/pagedata/PageDataSchema.jsm
@@ -11,13 +11,13 @@ Cu.importGlobalProperties(["fetch"]);
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   JsonSchemaValidator:
     "resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
   OpenGraphPageData: "resource:///modules/pagedata/OpenGraphPageData.jsm",
   SchemaOrgPageData: "resource:///modules/pagedata/SchemaOrgPageData.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TwitterPageData: "resource:///modules/pagedata/TwitterPageData.jsm",
 });
 
diff --git a/browser/components/pagedata/PageDataService.jsm b/browser/components/pagedata/PageDataService.jsm
index 0a57710b9935..aec75932743d 100644
--- a/browser/components/pagedata/PageDataService.jsm
+++ b/browser/components/pagedata/PageDataService.jsm
@@ -9,10 +9,10 @@ var EXPORTED_SYMBOLS = ["PageDataService"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   E10SUtils: "resource://gre/modules/E10SUtils.jsm",
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
   HiddenFrame: "resource://gre/modules/HiddenFrame.jsm",
diff --git a/browser/components/pagedata/tests/unit/head.js b/browser/components/pagedata/tests/unit/head.js
index 661fb4e70cc2..6156e2c138d3 100644
--- a/browser/components/pagedata/tests/unit/head.js
+++ b/browser/components/pagedata/tests/unit/head.js
@@ -4,10 +4,10 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PageDataSchema: "resource:///modules/pagedata/PageDataSchema.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
diff --git a/browser/components/places/Interactions.jsm b/browser/components/places/Interactions.jsm
index 1b73baeed2d8..14d3df9c49f6 100644
--- a/browser/components/places/Interactions.jsm
+++ b/browser/components/places/Interactions.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["Interactions"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PageDataService: "resource:///modules/pagedata/PageDataService.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Snapshots: "resource:///modules/Snapshots.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
diff --git a/browser/components/places/InteractionsBlocklist.jsm b/browser/components/places/InteractionsBlocklist.jsm
index 82be64faf871..0da80bfd2058 100644
--- a/browser/components/places/InteractionsBlocklist.jsm
+++ b/browser/components/places/InteractionsBlocklist.jsm
@@ -9,10 +9,10 @@ var EXPORTED_SYMBOLS = ["InteractionsBlocklist"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
diff --git a/browser/components/places/SnapshotGroups.jsm b/browser/components/places/SnapshotGroups.jsm
index d18c24c36db6..69c546f1ddbd 100644
--- a/browser/components/places/SnapshotGroups.jsm
+++ b/browser/components/places/SnapshotGroups.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["SnapshotGroups"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm",
@@ -16,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesPreviews: "resource://gre/modules/PlacesPreviews.jsm",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Snapshots: "resource:///modules/Snapshots.jsm",
   SnapshotMonitor: "resource:///modules/SnapshotMonitor.jsm",
 });
diff --git a/browser/components/places/SnapshotMonitor.jsm b/browser/components/places/SnapshotMonitor.jsm
index 993d878d1868..1b45ea5b8929 100644
--- a/browser/components/places/SnapshotMonitor.jsm
+++ b/browser/components/places/SnapshotMonitor.jsm
@@ -7,12 +7,12 @@ const EXPORTED_SYMBOLS = ["SnapshotMonitor"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   clearTimeout: "resource://gre/modules/Timer.jsm",
   DomainGroupBuilder: "resource:///modules/DomainGroupBuilder.jsm",
   PinnedGroupBuilder: "resource:///modules/PinnedGroupBuilder.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   Snapshots: "resource:///modules/Snapshots.jsm",
 });
diff --git a/browser/components/places/SnapshotScorer.jsm b/browser/components/places/SnapshotScorer.jsm
index 07b5d396569f..279a4a3a96c4 100644
--- a/browser/components/places/SnapshotScorer.jsm
+++ b/browser/components/places/SnapshotScorer.jsm
@@ -7,9 +7,9 @@ const EXPORTED_SYMBOLS = ["SnapshotScorer"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   Snapshots: "resource:///modules/Snapshots.jsm",
   FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
 });
diff --git a/browser/components/places/SnapshotSelector.jsm b/browser/components/places/SnapshotSelector.jsm
index b796b966159e..a3ae29878572 100644
--- a/browser/components/places/SnapshotSelector.jsm
+++ b/browser/components/places/SnapshotSelector.jsm
@@ -6,12 +6,12 @@ const EXPORTED_SYMBOLS = ["SnapshotSelector"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
   DeferredTask: "resource://gre/modules/DeferredTask.jsm",
   FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
   Snapshots: "resource:///modules/Snapshots.jsm",
   SnapshotScorer: "resource:///modules/SnapshotScorer.jsm",
diff --git a/browser/components/places/Snapshots.jsm b/browser/components/places/Snapshots.jsm
index a0626405f5ff..136459638f7b 100644
--- a/browser/components/places/Snapshots.jsm
+++ b/browser/components/places/Snapshots.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["Snapshots"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm",
@@ -20,7 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   PlacesPreviews: "resource://gre/modules/PlacesPreviews.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 /**
diff --git a/browser/components/places/tests/unit/interactions/head_interactions.js b/browser/components/places/tests/unit/interactions/head_interactions.js
index 6dde2b3ad86d..aa56b63e2dd0 100644
--- a/browser/components/places/tests/unit/interactions/head_interactions.js
+++ b/browser/components/places/tests/unit/interactions/head_interactions.js
@@ -5,6 +5,7 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   Interactions: "resource:///modules/Interactions.jsm",
@@ -13,7 +14,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   SnapshotGroups: "resource:///modules/SnapshotGroups.jsm",
   Snapshots: "resource:///modules/Snapshots.jsm",
   SnapshotMonitor: "resource:///modules/SnapshotMonitor.jsm",
diff --git a/browser/components/search/BrowserSearchTelemetry.jsm b/browser/components/search/BrowserSearchTelemetry.jsm
index d13e0df034cd..0370e10f9f63 100644
--- a/browser/components/search/BrowserSearchTelemetry.jsm
+++ b/browser/components/search/BrowserSearchTelemetry.jsm
@@ -9,12 +9,12 @@ var EXPORTED_SYMBOLS = ["BrowserSearchTelemetry"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm",
 });
 
diff --git a/browser/components/search/SearchOneOffs.jsm b/browser/components/search/SearchOneOffs.jsm
index ed0e0ee5c60b..0d60e6663a93 100644
--- a/browser/components/search/SearchOneOffs.jsm
+++ b/browser/components/search/SearchOneOffs.jsm
@@ -9,10 +9,10 @@ var EXPORTED_SYMBOLS = ["SearchOneOffs"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   SearchUIUtils: "resource:///modules/SearchUIUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const EMPTY_ADD_ENGINES = [];
diff --git a/browser/components/search/SearchSERPTelemetry.jsm b/browser/components/search/SearchSERPTelemetry.jsm
index 2ec778078f8e..a03a117da7fd 100644
--- a/browser/components/search/SearchSERPTelemetry.jsm
+++ b/browser/components/search/SearchSERPTelemetry.jsm
@@ -9,12 +9,12 @@ var EXPORTED_SYMBOLS = ["SearchSERPTelemetry"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 // The various histograms and scalars that we report to.
diff --git a/browser/components/search/test/unit/test_urlTelemetry.js b/browser/components/search/test/unit/test_urlTelemetry.js
index 530f036b5967..dfcb209ac88a 100644
--- a/browser/components/search/test/unit/test_urlTelemetry.js
+++ b/browser/components/search/test/unit/test_urlTelemetry.js
@@ -4,13 +4,13 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
diff --git a/browser/components/search/test/unit/test_urlTelemetry_generic.js b/browser/components/search/test/unit/test_urlTelemetry_generic.js
index ffbcd21098cd..ae737db69e07 100644
--- a/browser/components/search/test/unit/test_urlTelemetry_generic.js
+++ b/browser/components/search/test/unit/test_urlTelemetry_generic.js
@@ -4,13 +4,13 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
diff --git a/browser/components/touchbar/MacTouchBar.js b/browser/components/touchbar/MacTouchBar.js
index 12e9d78f448a..93a51a9eb8f4 100644
--- a/browser/components/touchbar/MacTouchBar.js
+++ b/browser/components/touchbar/MacTouchBar.js
@@ -8,12 +8,12 @@ const { ComponentUtils } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
 });
 
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 4af01ca6d14d..4e1586701abf 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["UITour"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
 XPCOMUtils.defineLazyModuleGetters(this, {
@@ -22,7 +23,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PanelMultiView: "resource:///modules/PanelMultiView.jsm",
   ProfileAge: "resource://gre/modules/ProfileAge.jsm",
   ResetProfile: "resource://gre/modules/ResetProfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TelemetryController: "resource://gre/modules/TelemetryController.jsm",
   UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
 });
diff --git a/browser/components/urlbar/UrlbarEventBufferer.jsm b/browser/components/urlbar/UrlbarEventBufferer.jsm
index 3c43403b195b..67a95e1abb96 100644
--- a/browser/components/urlbar/UrlbarEventBufferer.jsm
+++ b/browser/components/urlbar/UrlbarEventBufferer.jsm
@@ -9,10 +9,10 @@ var EXPORTED_SYMBOLS = ["UrlbarEventBufferer"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   clearTimeout: "resource://gre/modules/Timer.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
index 52b0727026f4..e566eb8c03a2 100644
--- a/browser/components/urlbar/UrlbarInput.jsm
+++ b/browser/components/urlbar/UrlbarInput.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["UrlbarInput"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -24,7 +25,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
   SearchUIUtils: "resource:///modules/SearchUIUtils.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarController: "resource:///modules/UrlbarController.jsm",
   UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
diff --git a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
index 8637df519dab..a9f3b41aef3c 100644
--- a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
+++ b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
@@ -13,8 +13,8 @@ var EXPORTED_SYMBOLS = ["UrlbarMuxerUnifiedComplete"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProviderQuickSuggest:
     "resource:///modules/UrlbarProviderQuickSuggest.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderExtension.jsm b/browser/components/urlbar/UrlbarProviderExtension.jsm
index 23dc0b6901a3..67a1bf00d919 100644
--- a/browser/components/urlbar/UrlbarProviderExtension.jsm
+++ b/browser/components/urlbar/UrlbarProviderExtension.jsm
@@ -14,8 +14,8 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderExtension"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   SkippableTimer: "resource:///modules/UrlbarUtils.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm b/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm
index 080458e779ea..1b6413499f14 100644
--- a/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm
+++ b/browser/components/urlbar/UrlbarProviderHeuristicFallback.jsm
@@ -15,8 +15,8 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderHeuristicFallback"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
   UrlbarResult: "resource:///modules/UrlbarResult.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderInterventions.jsm b/browser/components/urlbar/UrlbarProviderInterventions.jsm
index ad1468c5fe79..e1fb5559ac0b 100644
--- a/browser/components/urlbar/UrlbarProviderInterventions.jsm
+++ b/browser/components/urlbar/UrlbarProviderInterventions.jsm
@@ -10,6 +10,7 @@ var gGlobalScope = this;
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppUpdater: "resource:///modules/AppUpdater.jsm",
@@ -18,7 +19,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   ResetProfile: "resource://gre/modules/ResetProfile.jsm",
   Sanitizer: "resource:///modules/Sanitizer.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
   UrlbarResult: "resource:///modules/UrlbarResult.jsm",
   UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm b/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
index e5bc75989a19..dfd4b81ca544 100644
--- a/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
+++ b/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
@@ -15,12 +15,12 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderPreloadedSites"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ProfileAge: "resource://gre/modules/ProfileAge.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
   UrlbarResult: "resource:///modules/UrlbarResult.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm b/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
index 713fb02ae909..77903e493a70 100644
--- a/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
+++ b/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
@@ -13,8 +13,8 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderPrivateSearch"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   SkippableTimer: "resource:///modules/UrlbarUtils.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
   UrlbarResult: "resource:///modules/UrlbarResult.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm b/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
index 14140553043c..3e76197f64f8 100644
--- a/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
+++ b/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderQuickSuggest", "QUICK_SUGGEST_SOURCE"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
     "resource:///modules/PartnerLinkAttribution.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setInterval: "resource://gre/modules/Timer.jsm",
   SkippableTimer: "resource:///modules/UrlbarUtils.jsm",
   TaskQueue: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm b/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm
index 3ad3186df0c0..6eb82cf2d789 100644
--- a/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm
+++ b/browser/components/urlbar/UrlbarProviderRemoteTabs.jsm
@@ -13,9 +13,9 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderRemoteTabs"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm b/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
index 85a01599f724..7dcac1236557 100644
--- a/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
+++ b/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
@@ -13,10 +13,10 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderSearchSuggestions"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   SearchSuggestionController:
     "resource://gre/modules/SearchSuggestionController.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   SkippableTimer: "resource:///modules/UrlbarUtils.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderSearchTips.jsm b/browser/components/urlbar/UrlbarProviderSearchTips.jsm
index e79ef7245408..3783175b6f1d 100644
--- a/browser/components/urlbar/UrlbarProviderSearchTips.jsm
+++ b/browser/components/urlbar/UrlbarProviderSearchTips.jsm
@@ -14,13 +14,13 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderSearchTips"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
   DefaultBrowserCheck: "resource:///modules/BrowserGlue.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   ProfileAge: "resource://gre/modules/ProfileAge.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderTabToSearch.jsm b/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
index 8b4e26d57dd6..6709b9fa5169 100644
--- a/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
+++ b/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
@@ -14,8 +14,8 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderTabToSearch"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarView: "resource:///modules/UrlbarView.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarProviderTopSites.jsm b/browser/components/urlbar/UrlbarProviderTopSites.jsm
index a34a54176e20..e9c2262b914f 100644
--- a/browser/components/urlbar/UrlbarProviderTopSites.jsm
+++ b/browser/components/urlbar/UrlbarProviderTopSites.jsm
@@ -13,6 +13,7 @@ var EXPORTED_SYMBOLS = ["UrlbarProviderTopSites"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.jsm",
@@ -20,7 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
     "resource:///modules/PartnerLinkAttribution.jsm",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
   UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.jsm",
diff --git a/browser/components/urlbar/UrlbarQuickSuggest.jsm b/browser/components/urlbar/UrlbarQuickSuggest.jsm
index 656e3e5bb62f..b57f66673991 100644
--- a/browser/components/urlbar/UrlbarQuickSuggest.jsm
+++ b/browser/components/urlbar/UrlbarQuickSuggest.jsm
@@ -9,6 +9,7 @@ const EXPORTED_SYMBOLS = ["ONBOARDING_CHOICE", "UrlbarQuickSuggest"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
@@ -16,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   QUICK_SUGGEST_SOURCE: "resource:///modules/UrlbarProviderQuickSuggest.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
-  Services: "resource://gre/modules/Services.jsm",
   TaskQueue: "resource:///modules/UrlbarUtils.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProviderQuickSuggest:
diff --git a/browser/components/urlbar/UrlbarSearchOneOffs.jsm b/browser/components/urlbar/UrlbarSearchOneOffs.jsm
index 6eb547ece841..3b75a286761d 100644
--- a/browser/components/urlbar/UrlbarSearchOneOffs.jsm
+++ b/browser/components/urlbar/UrlbarSearchOneOffs.jsm
@@ -9,9 +9,9 @@ var EXPORTED_SYMBOLS = ["UrlbarSearchOneOffs"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   SearchOneOffs: "resource:///modules/SearchOneOffs.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
diff --git a/browser/components/urlbar/UrlbarTokenizer.jsm b/browser/components/urlbar/UrlbarTokenizer.jsm
index c172b765ee36..3eb4b6af2c1b 100644
--- a/browser/components/urlbar/UrlbarTokenizer.jsm
+++ b/browser/components/urlbar/UrlbarTokenizer.jsm
@@ -15,8 +15,8 @@ var EXPORTED_SYMBOLS = ["UrlbarTokenizer"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
diff --git a/browser/components/urlbar/UrlbarUtils.jsm b/browser/components/urlbar/UrlbarUtils.jsm
index 9ab6569fee98..2f1481c99aab 100644
--- a/browser/components/urlbar/UrlbarUtils.jsm
+++ b/browser/components/urlbar/UrlbarUtils.jsm
@@ -22,6 +22,7 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   FormHistory: "resource://gre/modules/FormHistory.jsm",
@@ -32,7 +33,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   SearchSuggestionController:
     "resource://gre/modules/SearchSuggestionController.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm",
diff --git a/browser/components/urlbar/UrlbarValueFormatter.jsm b/browser/components/urlbar/UrlbarValueFormatter.jsm
index 9ca4222f88cb..21e45643cc7a 100644
--- a/browser/components/urlbar/UrlbarValueFormatter.jsm
+++ b/browser/components/urlbar/UrlbarValueFormatter.jsm
@@ -9,10 +9,10 @@ var EXPORTED_SYMBOLS = ["UrlbarValueFormatter"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
diff --git a/browser/components/urlbar/UrlbarView.jsm b/browser/components/urlbar/UrlbarView.jsm
index 6d26bb276681..1df6640bdf85 100644
--- a/browser/components/urlbar/UrlbarView.jsm
+++ b/browser/components/urlbar/UrlbarView.jsm
@@ -9,11 +9,11 @@ var EXPORTED_SYMBOLS = ["UrlbarView"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   L10nCache: "resource:///modules/UrlbarUtils.jsm",
   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
   UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.jsm",
diff --git a/browser/components/urlbar/tests/UrlbarTestUtils.jsm b/browser/components/urlbar/tests/UrlbarTestUtils.jsm
index 949848bf21fe..bdae9df78e8d 100644
--- a/browser/components/urlbar/tests/UrlbarTestUtils.jsm
+++ b/browser/components/urlbar/tests/UrlbarTestUtils.jsm
@@ -8,6 +8,7 @@ const EXPORTED_SYMBOLS = ["UrlbarTestUtils"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   TestUtils: "resource://testing-common/TestUtils.jsm",
   UrlbarController: "resource:///modules/UrlbarController.jsm",
diff --git a/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm b/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm
index e2d6bbd36691..624d795688af 100644
--- a/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm
+++ b/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.jsm
@@ -8,6 +8,7 @@ const EXPORTED_SYMBOLS = ["QuickSuggestTestUtils"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CONTEXTUAL_SERVICES_PING_TYPES:
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
   TestUtils: "resource://testing-common/TestUtils.jsm",
diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js
index 7f358acdaadb..1821ae9a59c4 100644
--- a/browser/components/urlbar/tests/unit/head.js
+++ b/browser/components/urlbar/tests/unit/head.js
@@ -4,6 +4,7 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var {
   UrlbarMuxer,
@@ -19,7 +20,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TestUtils: "resource://testing-common/TestUtils.jsm",
   UrlbarController: "resource:///modules/UrlbarController.jsm",
   UrlbarInput: "resource:///modules/UrlbarInput.jsm",
diff --git a/browser/modules/AppUpdater.jsm b/browser/modules/AppUpdater.jsm
index 591b804b8dce..a825e8ebf9a7 100644
--- a/browser/modules/AppUpdater.jsm
+++ b/browser/modules/AppUpdater.jsm
@@ -9,9 +9,9 @@ var EXPORTED_SYMBOLS = ["AppUpdater"];
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
 });
 
diff --git a/browser/modules/AsyncTabSwitcher.jsm b/browser/modules/AsyncTabSwitcher.jsm
index e2ca9b5d41d8..1d923ad08f3a 100644
--- a/browser/modules/AsyncTabSwitcher.jsm
+++ b/browser/modules/AsyncTabSwitcher.jsm
@@ -10,10 +10,10 @@ var EXPORTED_SYMBOLS = ["AsyncTabSwitcher"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   PictureInPicture: "resource://gre/modules/PictureInPicture.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(
diff --git a/browser/modules/BrowserUsageTelemetry.jsm b/browser/modules/BrowserUsageTelemetry.jsm
index 8135c833ec54..37c0b240661e 100644
--- a/browser/modules/BrowserUsageTelemetry.jsm
+++ b/browser/modules/BrowserUsageTelemetry.jsm
@@ -15,6 +15,7 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -23,7 +24,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PageActions: "resource:///modules/PageActions.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   WindowsInstallsInfo:
     "resource://gre/modules/components-utils/WindowsInstallsInfo.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
diff --git a/browser/modules/ExtensionsUI.jsm b/browser/modules/ExtensionsUI.jsm
index 3e1780e84535..3266272bfb4e 100644
--- a/browser/modules/ExtensionsUI.jsm
+++ b/browser/modules/ExtensionsUI.jsm
@@ -11,6 +11,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { EventEmitter } = ChromeUtils.import(
   "resource://gre/modules/EventEmitter.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -19,7 +20,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
   ExtensionData: "resource://gre/modules/Extension.jsm",
   ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const DEFAULT_EXTENSION_ICON =
diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm
index f73b0f3e6c8c..3cf57ba6a59a 100644
--- a/browser/modules/HomePage.jsm
+++ b/browser/modules/HomePage.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["HomePage"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CustomizableUI: "resource:///modules/CustomizableUI.jsm",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
     "resource://gre/modules/ExtensionPreferencesManager.jsm",
   IgnoreLists: "resource://gre/modules/IgnoreLists.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const kPrefName = "browser.startup.homepage";
diff --git a/browser/modules/PageActions.jsm b/browser/modules/PageActions.jsm
index 1b164a2fdc11..d4612390ba56 100644
--- a/browser/modules/PageActions.jsm
+++ b/browser/modules/PageActions.jsm
@@ -15,12 +15,12 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   BinarySearch: "resource://gre/modules/BinarySearch.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const ACTION_ID_BOOKMARK = "bookmark";
diff --git a/browser/modules/PartnerLinkAttribution.jsm b/browser/modules/PartnerLinkAttribution.jsm
index 9e606371ce85..f63be68afa5f 100644
--- a/browser/modules/PartnerLinkAttribution.jsm
+++ b/browser/modules/PartnerLinkAttribution.jsm
@@ -14,9 +14,9 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   Region: "resource://gre/modules/Region.jsm",
   PingCentre: "resource:///modules/PingCentre.jsm",
 });
diff --git a/browser/modules/test/unit/test_HomePage.js b/browser/modules/test/unit/test_HomePage.js
index cbe736233bb6..f312482ca458 100644
--- a/browser/modules/test/unit/test_HomePage.js
+++ b/browser/modules/test/unit/test_HomePage.js
@@ -7,10 +7,10 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   HomePage: "resource:///modules/HomePage.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   // RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
diff --git a/browser/modules/test/unit/test_HomePage_ignore.js b/browser/modules/test/unit/test_HomePage_ignore.js
index 72ab0b0bd31f..c1a6b4f9e9e3 100644
--- a/browser/modules/test/unit/test_HomePage_ignore.js
+++ b/browser/modules/test/unit/test_HomePage_ignore.js
@@ -7,10 +7,10 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   HomePage: "resource:///modules/HomePage.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   sinon: "resource://testing-common/Sinon.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
diff --git a/browser/themes/BuiltInThemes.jsm b/browser/themes/BuiltInThemes.jsm
index 2ef406b4cccf..46822b646dcb 100644
--- a/browser/themes/BuiltInThemes.jsm
+++ b/browser/themes/BuiltInThemes.jsm
@@ -7,11 +7,11 @@ var EXPORTED_SYMBOLS = ["BuiltInThemes"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   BuiltInThemeConfig: "resource:///modules/BuiltInThemeConfig.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const kActiveThemePref = "extensions.activeThemeID";
diff --git a/docshell/test/unit/head_docshell.js b/docshell/test/unit/head_docshell.js
index 4eab994c80aa..708dde0027e9 100644
--- a/docshell/test/unit/head_docshell.js
+++ b/docshell/test/unit/head_docshell.js
@@ -5,13 +5,13 @@
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TestUtils: "resource://testing-common/TestUtils.jsm",
 });
 
diff --git a/dom/push/test/xpcshell/head.js b/dom/push/test/xpcshell/head.js
index 71890d99c282..6d12b3a73040 100644
--- a/dom/push/test/xpcshell/head.js
+++ b/dom/push/test/xpcshell/head.js
@@ -6,6 +6,7 @@
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
@@ -18,7 +19,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PushService: "resource://gre/modules/PushService.jsm",
   PushServiceHttp2: "resource://gre/modules/PushService.jsm",
   PushServiceWebSocket: "resource://gre/modules/PushService.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 var {
   clearInterval,
diff --git a/remote/cdp/CDPConnection.jsm b/remote/cdp/CDPConnection.jsm
index 3124e683d487..88a79050b8b5 100644
--- a/remote/cdp/CDPConnection.jsm
+++ b/remote/cdp/CDPConnection.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["CDPConnection", "splitMethod"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Log: "chrome://remote/content/shared/Log.jsm",
   truncate: "chrome://remote/content/shared/Format.jsm",
   UnknownMethodError: "chrome://remote/content/cdp/Error.jsm",
diff --git a/remote/cdp/Error.jsm b/remote/cdp/Error.jsm
index 35bc4fd9a10f..5c803c1de333 100644
--- a/remote/cdp/Error.jsm
+++ b/remote/cdp/Error.jsm
@@ -11,13 +11,12 @@ var EXPORTED_SYMBOLS = [
   "UnsupportedError",
 ];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Log: "chrome://remote/content/shared/Log.jsm",
 });
 
diff --git a/remote/cdp/JSONHandler.jsm b/remote/cdp/JSONHandler.jsm
index 15973f94e23d..177b4138a325 100644
--- a/remote/cdp/JSONHandler.jsm
+++ b/remote/cdp/JSONHandler.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["JSONHandler"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   HTTP_404: "chrome://remote/content/server/HTTPD.jsm",
   HTTP_505: "chrome://remote/content/server/HTTPD.jsm",
   Log: "chrome://remote/content/shared/Log.jsm",
diff --git a/remote/cdp/StreamRegistry.jsm b/remote/cdp/StreamRegistry.jsm
index ae9869f487be..577a0610a3ae 100644
--- a/remote/cdp/StreamRegistry.jsm
+++ b/remote/cdp/StreamRegistry.jsm
@@ -6,6 +6,7 @@
 
 var EXPORTED_SYMBOLS = ["StreamRegistry"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
@@ -13,7 +14,6 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   UnsupportedError: "chrome://remote/content/cdp/Error.jsm",
 });
diff --git a/remote/cdp/domains/content/Log.jsm b/remote/cdp/domains/content/Log.jsm
index a93400a81700..5cc4092effba 100644
--- a/remote/cdp/domains/content/Log.jsm
+++ b/remote/cdp/domains/content/Log.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["Log"];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   ContentProcessDomain:
     "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
 });
diff --git a/remote/cdp/domains/content/Runtime.jsm b/remote/cdp/domains/content/Runtime.jsm
index 77e2cbd1e108..8742d7849e0d 100644
--- a/remote/cdp/domains/content/Runtime.jsm
+++ b/remote/cdp/domains/content/Runtime.jsm
@@ -6,13 +6,13 @@
 
 var EXPORTED_SYMBOLS = ["Runtime"];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   addDebuggerToGlobal: "resource://gre/modules/jsdebugger.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   ContentProcessDomain:
     "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm",
diff --git a/remote/cdp/domains/parent/Browser.jsm b/remote/cdp/domains/parent/Browser.jsm
index e115b3160739..25d983d9ac2f 100644
--- a/remote/cdp/domains/parent/Browser.jsm
+++ b/remote/cdp/domains/parent/Browser.jsm
@@ -6,12 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["Browser"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
 });
 
diff --git a/remote/cdp/domains/parent/Input.jsm b/remote/cdp/domains/parent/Input.jsm
index 34c918228045..d5afc93cf0b7 100644
--- a/remote/cdp/domains/parent/Input.jsm
+++ b/remote/cdp/domains/parent/Input.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["Input"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
 });
 
diff --git a/remote/cdp/domains/parent/Network.jsm b/remote/cdp/domains/parent/Network.jsm
index f7a2a1a80ed1..00cd6edb7722 100644
--- a/remote/cdp/domains/parent/Network.jsm
+++ b/remote/cdp/domains/parent/Network.jsm
@@ -6,12 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["Network"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
 });
 
diff --git a/remote/cdp/domains/parent/Page.jsm b/remote/cdp/domains/parent/Page.jsm
index 28d40a84c338..11012c104098 100644
--- a/remote/cdp/domains/parent/Page.jsm
+++ b/remote/cdp/domains/parent/Page.jsm
@@ -6,14 +6,14 @@
 
 var EXPORTED_SYMBOLS = ["Page"];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   clearInterval: "resource://gre/modules/Timer.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
   setInterval: "resource://gre/modules/Timer.jsm",
 
diff --git a/remote/cdp/domains/parent/Target.jsm b/remote/cdp/domains/parent/Target.jsm
index b822522d5888..67f4eb668bcc 100644
--- a/remote/cdp/domains/parent/Target.jsm
+++ b/remote/cdp/domains/parent/Target.jsm
@@ -6,6 +6,7 @@
 
 var EXPORTED_SYMBOLS = ["Target"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
@@ -13,7 +14,6 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   ContextualIdentityService:
     "resource://gre/modules/ContextualIdentityService.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   Domain: "chrome://remote/content/cdp/domains/Domain.jsm",
   MainProcessTarget:
diff --git a/remote/cdp/domains/parent/page/DialogHandler.jsm b/remote/cdp/domains/parent/page/DialogHandler.jsm
index 37b26cc53a30..ceb8ce2d0180 100644
--- a/remote/cdp/domains/parent/page/DialogHandler.jsm
+++ b/remote/cdp/domains/parent/page/DialogHandler.jsm
@@ -6,13 +6,13 @@
 
 var EXPORTED_SYMBOLS = ["DialogHandler"];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const DIALOG_TYPES = {
diff --git a/remote/cdp/observers/ChannelEventSink.jsm b/remote/cdp/observers/ChannelEventSink.jsm
index bd10bacd1266..28915b0cb178 100644
--- a/remote/cdp/observers/ChannelEventSink.jsm
+++ b/remote/cdp/observers/ChannelEventSink.jsm
@@ -6,13 +6,13 @@
 
 var EXPORTED_SYMBOLS = ["ChannelEventSinkFactory"];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ComponentUtils: "resource://gre/modules/ComponentUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const Cm = Components.manager;
diff --git a/remote/cdp/observers/ContextObserver.jsm b/remote/cdp/observers/ContextObserver.jsm
index 8991928b92a4..70aed4f16ea0 100644
--- a/remote/cdp/observers/ContextObserver.jsm
+++ b/remote/cdp/observers/ContextObserver.jsm
@@ -25,13 +25,13 @@
 
 var EXPORTED_SYMBOLS = ["ContextObserver"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   executeSoon: "chrome://remote/content/shared/Sync.jsm",
 });
diff --git a/remote/cdp/observers/NetworkObserver.jsm b/remote/cdp/observers/NetworkObserver.jsm
index 72e505ac5349..e139829db36b 100644
--- a/remote/cdp/observers/NetworkObserver.jsm
+++ b/remote/cdp/observers/NetworkObserver.jsm
@@ -4,6 +4,7 @@
 
 "use strict";
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
@@ -12,7 +13,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   CommonUtils: "resource://services-common/utils.js",
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   ChannelEventSinkFactory:
     "chrome://remote/content/cdp/observers/ChannelEventSink.jsm",
diff --git a/remote/cdp/observers/TargetObserver.jsm b/remote/cdp/observers/TargetObserver.jsm
index 3c8a27282908..76815c06905a 100644
--- a/remote/cdp/observers/TargetObserver.jsm
+++ b/remote/cdp/observers/TargetObserver.jsm
@@ -6,13 +6,13 @@
 
 var EXPORTED_SYMBOLS = ["TabObserver"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   EventPromise: "chrome://remote/content/shared/Sync.jsm",
 });
diff --git a/remote/cdp/targets/Target.jsm b/remote/cdp/targets/Target.jsm
index c157ecd5a39c..8f2455a82186 100644
--- a/remote/cdp/targets/Target.jsm
+++ b/remote/cdp/targets/Target.jsm
@@ -6,13 +6,13 @@
 
 var EXPORTED_SYMBOLS = ["Target"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CDPConnection: "chrome://remote/content/cdp/CDPConnection.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   WebSocketHandshake: "chrome://remote/content/server/WebSocketHandshake.jsm",
 });
 
diff --git a/remote/components/RemoteAgent.jsm b/remote/components/RemoteAgent.jsm
index 2418d05eff22..bc6cdbd7e3e4 100644
--- a/remote/components/RemoteAgent.jsm
+++ b/remote/components/RemoteAgent.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["RemoteAgent", "RemoteAgentFactory"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   CDP: "chrome://remote/content/cdp/CDP.jsm",
   Deferred: "chrome://remote/content/shared/Sync.jsm",
   HttpServer: "chrome://remote/content/server/HTTPD.jsm",
diff --git a/remote/marionette/actors/MarionetteCommandsChild.jsm b/remote/marionette/actors/MarionetteCommandsChild.jsm
index 713c477bf81a..6ced398fc0b0 100644
--- a/remote/marionette/actors/MarionetteCommandsChild.jsm
+++ b/remote/marionette/actors/MarionetteCommandsChild.jsm
@@ -8,13 +8,12 @@
 
 const EXPORTED_SYMBOLS = ["MarionetteCommandsChild", "clearActionInputState"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   action: "chrome://remote/content/marionette/action.js",
   atom: "chrome://remote/content/marionette/atom.js",
   element: "chrome://remote/content/marionette/element.js",
diff --git a/remote/marionette/actors/MarionetteEventsChild.jsm b/remote/marionette/actors/MarionetteEventsChild.jsm
index c9477f7a996c..497b4e6987cd 100644
--- a/remote/marionette/actors/MarionetteEventsChild.jsm
+++ b/remote/marionette/actors/MarionetteEventsChild.jsm
@@ -8,13 +8,12 @@
 
 const EXPORTED_SYMBOLS = ["MarionetteEventsChild"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   event: "chrome://remote/content/marionette/event.js",
   Log: "chrome://remote/content/shared/Log.jsm",
 });
diff --git a/remote/marionette/actors/MarionetteEventsParent.jsm b/remote/marionette/actors/MarionetteEventsParent.jsm
index b969233d2a96..96a8c7b58896 100644
--- a/remote/marionette/actors/MarionetteEventsParent.jsm
+++ b/remote/marionette/actors/MarionetteEventsParent.jsm
@@ -11,13 +11,12 @@ const EXPORTED_SYMBOLS = [
   "MarionetteEventsParent",
 ];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
   Log: "chrome://remote/content/shared/Log.jsm",
 });
diff --git a/remote/marionette/appinfo.js b/remote/marionette/appinfo.js
index e498e63b42e7..494b39b22f02 100644
--- a/remote/marionette/appinfo.js
+++ b/remote/marionette/appinfo.js
@@ -6,14 +6,11 @@
 
 const EXPORTED_SYMBOLS = ["AppInfo"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-});
-
 const ID_FIREFOX = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
 const ID_THUNDERBIRD = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
 
diff --git a/remote/marionette/driver.js b/remote/marionette/driver.js
index 3d21785ce5ae..155d8aba1810 100644
--- a/remote/marionette/driver.js
+++ b/remote/marionette/driver.js
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["GeckoDriver"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Addon: "chrome://remote/content/marionette/addon.js",
   AppInfo: "chrome://remote/content/marionette/appinfo.js",
   assert: "chrome://remote/content/shared/webdriver/Assert.jsm",
diff --git a/remote/marionette/element.js b/remote/marionette/element.js
index 5192f2bc6d77..5e768fb11920 100644
--- a/remote/marionette/element.js
+++ b/remote/marionette/element.js
@@ -14,13 +14,13 @@ const EXPORTED_SYMBOLS = [
   "WebElement",
 ];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ContentDOMReference: "resource://gre/modules/ContentDOMReference.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   assert: "chrome://remote/content/shared/webdriver/Assert.jsm",
   atom: "chrome://remote/content/marionette/atom.js",
diff --git a/remote/marionette/event.js b/remote/marionette/event.js
index 4649b1c4b283..7047d9ab80a1 100644
--- a/remote/marionette/event.js
+++ b/remote/marionette/event.js
@@ -7,13 +7,13 @@
 
 const EXPORTED_SYMBOLS = ["event"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   keyData: "chrome://remote/content/shared/webdriver/KeyData.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 /** Provides functionality for creating and sending DOM events. */
diff --git a/remote/marionette/modal.js b/remote/marionette/modal.js
index 9e680189c558..5a91ffccd3b6 100644
--- a/remote/marionette/modal.js
+++ b/remote/marionette/modal.js
@@ -6,13 +6,13 @@
 
 const EXPORTED_SYMBOLS = ["modal"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppInfo: "chrome://remote/content/marionette/appinfo.js",
-  Services: "resource://gre/modules/Services.jsm",
 
   Log: "chrome://remote/content/shared/Log.jsm",
 });
diff --git a/remote/server/WebSocketHandshake.jsm b/remote/server/WebSocketHandshake.jsm
index 0f2683a0141e..029b71860096 100644
--- a/remote/server/WebSocketHandshake.jsm
+++ b/remote/server/WebSocketHandshake.jsm
@@ -10,13 +10,12 @@ var EXPORTED_SYMBOLS = ["WebSocketHandshake"];
 
 const CC = Components.Constructor;
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   executeSoon: "chrome://remote/content/shared/Sync.jsm",
   Log: "chrome://remote/content/shared/Log.jsm",
   RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
diff --git a/remote/shared/Format.jsm b/remote/shared/Format.jsm
index 70d01274f336..9417d41cff97 100644
--- a/remote/shared/Format.jsm
+++ b/remote/shared/Format.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["pprint", "truncate"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Log: "chrome://remote/content/shared/Log.jsm",
 });
 
diff --git a/remote/shared/RecommendedPreferences.jsm b/remote/shared/RecommendedPreferences.jsm
index 4968a0688a56..3f30c9e3ae40 100644
--- a/remote/shared/RecommendedPreferences.jsm
+++ b/remote/shared/RecommendedPreferences.jsm
@@ -6,13 +6,13 @@
 
 const EXPORTED_SYMBOLS = ["RecommendedPreferences"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   Preferences: "resource://gre/modules/Preferences.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   Log: "chrome://remote/content/shared/Log.jsm",
 });
diff --git a/remote/shared/Sync.jsm b/remote/shared/Sync.jsm
index 19d700c3c5f6..1fa33c905edd 100644
--- a/remote/shared/Sync.jsm
+++ b/remote/shared/Sync.jsm
@@ -12,13 +12,12 @@ var EXPORTED_SYMBOLS = [
   "PollPromise",
 ];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Log: "chrome://remote/content/shared/Log.jsm",
 });
 
diff --git a/remote/shared/TabManager.jsm b/remote/shared/TabManager.jsm
index a29f2e9ce61a..74ec2954f2b8 100644
--- a/remote/shared/TabManager.jsm
+++ b/remote/shared/TabManager.jsm
@@ -6,13 +6,12 @@
 
 var EXPORTED_SYMBOLS = ["TabManager"];
 
-var { XPCOMUtils } = ChromeUtils.import(
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   AppInfo: "chrome://remote/content/marionette/appinfo.js",
   EventPromise: "chrome://remote/content/shared/Sync.jsm",
   MobileTabBrowser: "chrome://remote/content/shared/MobileTabBrowser.jsm",
diff --git a/remote/shared/WebSocketConnection.jsm b/remote/shared/WebSocketConnection.jsm
index 99f646c94258..f857b0fc6e9f 100644
--- a/remote/shared/WebSocketConnection.jsm
+++ b/remote/shared/WebSocketConnection.jsm
@@ -7,13 +7,12 @@
 
 var EXPORTED_SYMBOLS = ["WebSocketConnection"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   Log: "chrome://remote/content/shared/Log.jsm",
   WebSocketTransport: "chrome://remote/content/server/WebSocketTransport.jsm",
 });
diff --git a/remote/shared/WindowManager.jsm b/remote/shared/WindowManager.jsm
index 7514c4cc954c..cf0c08a2d43f 100644
--- a/remote/shared/WindowManager.jsm
+++ b/remote/shared/WindowManager.jsm
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["windowManager"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   AppInfo: "chrome://remote/content/marionette/appinfo.js",
   error: "chrome://remote/content/shared/webdriver/Errors.jsm",
   TabManager: "chrome://remote/content/shared/TabManager.jsm",
diff --git a/remote/shared/listeners/BrowsingContextListener.jsm b/remote/shared/listeners/BrowsingContextListener.jsm
index 8ec150f8e92a..f05c666deac5 100644
--- a/remote/shared/listeners/BrowsingContextListener.jsm
+++ b/remote/shared/listeners/BrowsingContextListener.jsm
@@ -6,13 +6,13 @@
 
 const EXPORTED_SYMBOLS = ["BrowsingContextListener"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const OBSERVER_TOPIC_ATTACHED = "browsing-context-attached";
diff --git a/remote/shared/listeners/ConsoleListener.jsm b/remote/shared/listeners/ConsoleListener.jsm
index 0b40a6292190..50beaa9cd612 100644
--- a/remote/shared/listeners/ConsoleListener.jsm
+++ b/remote/shared/listeners/ConsoleListener.jsm
@@ -6,13 +6,13 @@
 
 const EXPORTED_SYMBOLS = ["ConsoleListener"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   getFramesFromStack: "chrome://remote/content/shared/Stack.jsm",
   Log: "chrome://remote/content/shared/Log.jsm",
diff --git a/remote/shared/messagehandler/ModuleCache.jsm b/remote/shared/messagehandler/ModuleCache.jsm
index 350b37c5534a..05f4907889ab 100644
--- a/remote/shared/messagehandler/ModuleCache.jsm
+++ b/remote/shared/messagehandler/ModuleCache.jsm
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["ModuleCache"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   getMessageHandlerClass:
     "chrome://remote/content/shared/messagehandler/MessageHandlerRegistry.jsm",
   // Additional protocols might use a different registry for their modules,
diff --git a/remote/shared/messagehandler/sessiondata/SessionData.jsm b/remote/shared/messagehandler/sessiondata/SessionData.jsm
index 75604b03e6c3..a6123357e746 100644
--- a/remote/shared/messagehandler/sessiondata/SessionData.jsm
+++ b/remote/shared/messagehandler/sessiondata/SessionData.jsm
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["SESSION_DATA_SHARED_DATA_KEY", "SessionData"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   ContextDescriptorType:
     "chrome://remote/content/shared/messagehandler/MessageHandler.jsm",
   Log: "chrome://remote/content/shared/Log.jsm",
diff --git a/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm b/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm
index 7f670792fbb6..ddc86be691f0 100644
--- a/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm
+++ b/remote/shared/messagehandler/sessiondata/SessionDataReader.jsm
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["readSessionData"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   SESSION_DATA_SHARED_DATA_KEY:
     "chrome://remote/content/shared/messagehandler/sessiondata/SessionData.jsm",
 });
diff --git a/remote/shared/webdriver/Capabilities.jsm b/remote/shared/webdriver/Capabilities.jsm
index c5dc9851cc42..fdfcbe1ea6c8 100644
--- a/remote/shared/webdriver/Capabilities.jsm
+++ b/remote/shared/webdriver/Capabilities.jsm
@@ -12,13 +12,13 @@ const EXPORTED_SYMBOLS = [
   "UnhandledPromptBehavior",
 ];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   Preferences: "resource://gre/modules/Preferences.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   AppInfo: "chrome://remote/content/marionette/appinfo.js",
   assert: "chrome://remote/content/shared/webdriver/Assert.jsm",
diff --git a/remote/shared/webdriver/Session.jsm b/remote/shared/webdriver/Session.jsm
index 941a844fa5e3..5f0b9f263999 100644
--- a/remote/shared/webdriver/Session.jsm
+++ b/remote/shared/webdriver/Session.jsm
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["WebDriverSession"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   accessibility: "chrome://remote/content/marionette/accessibility.js",
   allowAllCerts: "chrome://remote/content/marionette/cert.js",
   Capabilities: "chrome://remote/content/shared/webdriver/Capabilities.jsm",
diff --git a/remote/webdriver-bidi/modules/root/browsingContext.jsm b/remote/webdriver-bidi/modules/root/browsingContext.jsm
index f2c84d85ebdf..95542df4372f 100644
--- a/remote/webdriver-bidi/modules/root/browsingContext.jsm
+++ b/remote/webdriver-bidi/modules/root/browsingContext.jsm
@@ -6,13 +6,12 @@
 
 const EXPORTED_SYMBOLS = ["browsingContext"];
 
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-
   AppInfo: "chrome://remote/content/marionette/appinfo.js",
   assert: "chrome://remote/content/shared/webdriver/Assert.jsm",
   BrowsingContextListener:
diff --git a/testing/specialpowers/content/AppTestDelegateParent.jsm b/testing/specialpowers/content/AppTestDelegateParent.jsm
index 3eb05e308d2d..dabedbd0cfd3 100644
--- a/testing/specialpowers/content/AppTestDelegateParent.jsm
+++ b/testing/specialpowers/content/AppTestDelegateParent.jsm
@@ -9,11 +9,11 @@ const EXPORTED_SYMBOLS = ["AppTestDelegateParent"];
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // Each app needs to implement this
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppUiTestDelegate: "resource://testing-common/AppUiTestDelegate.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 class AppTestDelegateParent extends JSWindowActorParent {
diff --git a/toolkit/components/crashes/CrashManagerTest.jsm b/toolkit/components/crashes/CrashManagerTest.jsm
index 78a0343e77fd..0330a1cb2f4f 100644
--- a/toolkit/components/crashes/CrashManagerTest.jsm
+++ b/toolkit/components/crashes/CrashManagerTest.jsm
@@ -19,12 +19,12 @@ var EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CrashManager: "resource://gre/modules/CrashManager.jsm",
   Log: "resource://gre/modules/Log.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
 
diff --git a/toolkit/components/downloads/DownloadCore.jsm b/toolkit/components/downloads/DownloadCore.jsm
index 5292828f593a..9b09b502b19b 100644
--- a/toolkit/components/downloads/DownloadCore.jsm
+++ b/toolkit/components/downloads/DownloadCore.jsm
@@ -25,6 +25,7 @@ const { Integration } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -35,7 +36,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/components/downloads/DownloadHistory.jsm b/toolkit/components/downloads/DownloadHistory.jsm
index fa1f0034860d..7e7175472f33 100644
--- a/toolkit/components/downloads/DownloadHistory.jsm
+++ b/toolkit/components/downloads/DownloadHistory.jsm
@@ -21,13 +21,13 @@ const { DownloadList } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   Downloads: "resource://gre/modules/Downloads.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 // Places query used to retrieve all history downloads for the related list.
diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js
index dfdded11a879..0c1150d7f48c 100644
--- a/toolkit/components/downloads/test/unit/head.js
+++ b/toolkit/components/downloads/test/unit/head.js
@@ -15,6 +15,7 @@ var { Integration } = ChromeUtils.import(
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -29,7 +30,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   OS: "resource://gre/modules/osfile.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
   TestUtils: "resource://testing-common/TestUtils.jsm",
 });
diff --git a/toolkit/components/extensions/ExtensionPermissions.jsm b/toolkit/components/extensions/ExtensionPermissions.jsm
index d9129296cc15..6ce1220ec7e5 100644
--- a/toolkit/components/extensions/ExtensionPermissions.jsm
+++ b/toolkit/components/extensions/ExtensionPermissions.jsm
@@ -11,11 +11,11 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
   JSONFile: "resource://gre/modules/JSONFile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(
diff --git a/toolkit/components/extensions/ExtensionStorageIDB.jsm b/toolkit/components/extensions/ExtensionStorageIDB.jsm
index cb946eabdf64..80d3deb5f9e6 100644
--- a/toolkit/components/extensions/ExtensionStorageIDB.jsm
+++ b/toolkit/components/extensions/ExtensionStorageIDB.jsm
@@ -13,12 +13,12 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { IndexedDB } = ChromeUtils.import(
   "resource://gre/modules/IndexedDB.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionStorage: "resource://gre/modules/ExtensionStorage.jsm",
   ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
   getTrimmedString: "resource://gre/modules/ExtensionTelemetry.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   OS: "resource://gre/modules/osfile.jsm",
 });
 
diff --git a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
index 600d947be755..4dea86d293f7 100644
--- a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
+++ b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
@@ -44,6 +44,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { ExtensionUtils } = ChromeUtils.import(
   "resource://gre/modules/ExtensionUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -56,7 +57,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Kinto: "resource://services-common/kinto-offline-client.js",
   FirefoxAdapter: "resource://services-common/kinto-storage-adapter.js",
   Observers: "resource://services-common/observers.js",
-  Services: "resource://gre/modules/Services.jsm",
   Utils: "resource://services-sync/util.js",
 });
 
diff --git a/toolkit/components/extensions/NativeManifests.jsm b/toolkit/components/extensions/NativeManifests.jsm
index 5e8e0dc51011..d55e89563f8f 100644
--- a/toolkit/components/extensions/NativeManifests.jsm
+++ b/toolkit/components/extensions/NativeManifests.jsm
@@ -10,12 +10,12 @@ var EXPORTED_SYMBOLS = ["NativeManifests"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   Schemas: "resource://gre/modules/Schemas.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
 });
 
diff --git a/toolkit/components/extensions/NativeMessaging.jsm b/toolkit/components/extensions/NativeMessaging.jsm
index ca13770ceb79..e3949c02b5dc 100644
--- a/toolkit/components/extensions/NativeMessaging.jsm
+++ b/toolkit/components/extensions/NativeMessaging.jsm
@@ -10,6 +10,7 @@ var EXPORTED_SYMBOLS = ["NativeApp"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { EventEmitter } = ChromeUtils.import(
   "resource://gre/modules/EventEmitter.jsm"
@@ -24,7 +25,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   NativeManifests: "resource://gre/modules/NativeManifests.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Subprocess: "resource://gre/modules/Subprocess.jsm",
 });
 
diff --git a/toolkit/components/extensions/ext-browser-content.js b/toolkit/components/extensions/ext-browser-content.js
index fe6bc473acf7..d7b7340eae74 100644
--- a/toolkit/components/extensions/ext-browser-content.js
+++ b/toolkit/components/extensions/ext-browser-content.js
@@ -6,11 +6,11 @@
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   clearTimeout: "resource://gre/modules/Timer.jsm",
   ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
 
diff --git a/toolkit/components/messaging-system/targeting/Targeting.jsm b/toolkit/components/messaging-system/targeting/Targeting.jsm
index d92e4ee58186..67e4c3dbdf7b 100644
--- a/toolkit/components/messaging-system/targeting/Targeting.jsm
+++ b/toolkit/components/messaging-system/targeting/Targeting.jsm
@@ -7,8 +7,8 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   clearTimeout: "resource://gre/modules/Timer.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
diff --git a/toolkit/components/nimbus/lib/ExperimentManager.jsm b/toolkit/components/nimbus/lib/ExperimentManager.jsm
index 8568d71199d2..72c867f478e4 100644
--- a/toolkit/components/nimbus/lib/ExperimentManager.jsm
+++ b/toolkit/components/nimbus/lib/ExperimentManager.jsm
@@ -9,6 +9,7 @@ const EXPORTED_SYMBOLS = ["ExperimentManager", "_ExperimentManager"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
@@ -18,7 +19,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   FirstStartup: "resource://gre/modules/FirstStartup.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "log", () => {
diff --git a/toolkit/components/normandy/actions/AddonRolloutAction.jsm b/toolkit/components/normandy/actions/AddonRolloutAction.jsm
index 5f4053ad8816..6e52f606678d 100644
--- a/toolkit/components/normandy/actions/AddonRolloutAction.jsm
+++ b/toolkit/components/normandy/actions/AddonRolloutAction.jsm
@@ -10,6 +10,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { BaseAction } = ChromeUtils.import(
   "resource://normandy/actions/BaseAction.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ActionSchemas: "resource://normandy/actions/schemas/index.js",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   NormandyAddonManager: "resource://normandy/lib/NormandyAddonManager.jsm",
   NormandyApi: "resource://normandy/lib/NormandyApi.jsm",
   NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",
 });
diff --git a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
index 104e390bfee4..5d57c35d65ff 100644
--- a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
+++ b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
@@ -17,6 +17,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { BaseStudyAction } = ChromeUtils.import(
   "resource://normandy/actions/BaseStudyAction.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ActionSchemas: "resource://normandy/actions/schemas/index.js",
@@ -28,7 +29,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
   Sampling: "resource://gre/modules/components-utils/Sampling.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",
 });
diff --git a/toolkit/components/normandy/lib/ShieldPreferences.jsm b/toolkit/components/normandy/lib/ShieldPreferences.jsm
index 534b5f72c930..c1d29d58f165 100644
--- a/toolkit/components/normandy/lib/ShieldPreferences.jsm
+++ b/toolkit/components/normandy/lib/ShieldPreferences.jsm
@@ -6,9 +6,9 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   BranchedAddonStudyAction:
     "resource://normandy/actions/BranchedAddonStudyAction.jsm",
   AddonStudies: "resource://normandy/lib/AddonStudies.jsm",
diff --git a/toolkit/components/passwordmgr/LoginCSVImport.jsm b/toolkit/components/passwordmgr/LoginCSVImport.jsm
index e937d59741b3..901dbc8c2db8 100644
--- a/toolkit/components/passwordmgr/LoginCSVImport.jsm
+++ b/toolkit/components/passwordmgr/LoginCSVImport.jsm
@@ -17,12 +17,12 @@ const EXPORTED_SYMBOLS = [
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   LoginHelper: "resource://gre/modules/LoginHelper.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   ResponsivenessMonitor: "resource://gre/modules/ResponsivenessMonitor.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "d3", () => {
diff --git a/toolkit/components/passwordmgr/LoginExport.jsm b/toolkit/components/passwordmgr/LoginExport.jsm
index 197d1dcfed44..9486bb1be9e3 100644
--- a/toolkit/components/passwordmgr/LoginExport.jsm
+++ b/toolkit/components/passwordmgr/LoginExport.jsm
@@ -13,10 +13,10 @@ const EXPORTED_SYMBOLS = ["LoginExport"];
 let { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 class LoginExport {
diff --git a/toolkit/components/places/History.jsm b/toolkit/components/places/History.jsm
index 39ba5f00dfb6..c2527a8386b2 100644
--- a/toolkit/components/places/History.jsm
+++ b/toolkit/components/places/History.jsm
@@ -73,11 +73,11 @@ var EXPORTED_SYMBOLS = ["History"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/components/places/PlacesPreviews.jsm b/toolkit/components/places/PlacesPreviews.jsm
index 9a91201591a0..9d4e74c63344 100644
--- a/toolkit/components/places/PlacesPreviews.jsm
+++ b/toolkit/components/places/PlacesPreviews.jsm
@@ -12,6 +12,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { ComponentUtils } = ChromeUtils.import(
   "resource://gre/modules/ComponentUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   clearTimeout: "resource://gre/modules/Timer.jsm",
@@ -19,7 +20,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   EventEmitter: "resource://gre/modules/EventEmitter.jsm",
   PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
 
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index f5ba7ce08ba9..154f2cea5403 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -11,11 +11,11 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   Sqlite: "resource://gre/modules/Sqlite.jsm",
   Bookmarks: "resource://gre/modules/Bookmarks.jsm",
diff --git a/toolkit/components/places/tests/chrome/head.js b/toolkit/components/places/tests/chrome/head.js
index 655b1bf9087d..1876f99255a8 100644
--- a/toolkit/components/places/tests/chrome/head.js
+++ b/toolkit/components/places/tests/chrome/head.js
@@ -1,9 +1,9 @@
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
diff --git a/toolkit/components/satchel/test/unit/head_satchel.js b/toolkit/components/satchel/test/unit/head_satchel.js
index ba00c0bdbfdb..81e72129d255 100644
--- a/toolkit/components/satchel/test/unit/head_satchel.js
+++ b/toolkit/components/satchel/test/unit/head_satchel.js
@@ -15,11 +15,11 @@ const PR_HOURS = 60 * 60 * 1000000;
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   FormHistory: "resource://gre/modules/FormHistory.jsm",
   FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Sqlite: "resource://gre/modules/Sqlite.jsm",
 });
 
diff --git a/toolkit/components/search/OpenSearchEngine.jsm b/toolkit/components/search/OpenSearchEngine.jsm
index a774de71b064..b07ced298abc 100644
--- a/toolkit/components/search/OpenSearchEngine.jsm
+++ b/toolkit/components/search/OpenSearchEngine.jsm
@@ -7,12 +7,12 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   EngineURL: "resource://gre/modules/SearchEngine.jsm",
   SearchEngine: "resource://gre/modules/SearchEngine.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "logConsole", () => {
diff --git a/toolkit/components/search/SearchEngine.jsm b/toolkit/components/search/SearchEngine.jsm
index ed1d0ba5468f..3f44ecf075d5 100644
--- a/toolkit/components/search/SearchEngine.jsm
+++ b/toolkit/components/search/SearchEngine.jsm
@@ -7,13 +7,13 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
   Region: "resource://gre/modules/Region.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
 });
 
diff --git a/toolkit/components/search/SearchEngineSelector.jsm b/toolkit/components/search/SearchEngineSelector.jsm
index f30e69dfc4f2..80d5fc3e388b 100644
--- a/toolkit/components/search/SearchEngineSelector.jsm
+++ b/toolkit/components/search/SearchEngineSelector.jsm
@@ -9,11 +9,11 @@ var EXPORTED_SYMBOLS = ["SearchEngineSelector"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   RemoteSettings: "resource://services-settings/remote-settings.js",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const USER_LOCALE = "$USER_LOCALE";
diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm
index d0c990126d10..5bb299501ed7 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -10,6 +10,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { PromiseUtils } = ChromeUtils.import(
   "resource://gre/modules/PromiseUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -23,7 +24,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   SearchSettings: "resource://gre/modules/SearchSettings.jsm",
   SearchStaticData: "resource://gre/modules/SearchStaticData.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
 });
 
diff --git a/toolkit/components/search/SearchSettings.jsm b/toolkit/components/search/SearchSettings.jsm
index 55095aa667a8..403124693f11 100644
--- a/toolkit/components/search/SearchSettings.jsm
+++ b/toolkit/components/search/SearchSettings.jsm
@@ -7,11 +7,11 @@ var EXPORTED_SYMBOLS = ["SearchSettings"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   DeferredTask: "resource://gre/modules/DeferredTask.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "logConsole", () => {
diff --git a/toolkit/components/search/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm
index e7abca5eca3f..3f24f30687b1 100644
--- a/toolkit/components/search/SearchSuggestionController.jsm
+++ b/toolkit/components/search/SearchSuggestionController.jsm
@@ -9,10 +9,10 @@ var EXPORTED_SYMBOLS = ["SearchSuggestionController"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 const DEFAULT_FORM_HISTORY_PARAM = "searchbar-history";
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
index 0bf60e5f163a..c8ce794f7c21 100644
--- a/toolkit/components/search/SearchUtils.jsm
+++ b/toolkit/components/search/SearchUtils.jsm
@@ -11,10 +11,7 @@ var EXPORTED_SYMBOLS = ["SearchUtils"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
-});
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "logConsole", () => {
   return console.createInstance({
diff --git a/toolkit/components/search/tests/SearchTestUtils.jsm b/toolkit/components/search/tests/SearchTestUtils.jsm
index e8f8740d62ce..d607fcad412f 100644
--- a/toolkit/components/search/tests/SearchTestUtils.jsm
+++ b/toolkit/components/search/tests/SearchTestUtils.jsm
@@ -7,6 +7,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { MockRegistrar } = ChromeUtils.import(
   "resource://testing-common/MockRegistrar.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -14,7 +15,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
 });
 
diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
index d7b154afd175..9e882a309ee9 100644
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
@@ -6,6 +6,7 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.jsm",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
 });
 
diff --git a/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm b/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm
index 6599b18de0ab..bc78b7277ce0 100644
--- a/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm
+++ b/toolkit/components/taskscheduler/TaskSchedulerMacOSImpl.jsm
@@ -10,10 +10,10 @@ var EXPORTED_SYMBOLS = ["_TaskSchedulerMacOSImpl"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Subprocess: "resource://gre/modules/Subprocess.jsm",
 });
 
diff --git a/toolkit/components/telemetry/pings/UninstallPing.jsm b/toolkit/components/telemetry/pings/UninstallPing.jsm
index 8dfd9001b5ab..fdc6a4a7310b 100644
--- a/toolkit/components/telemetry/pings/UninstallPing.jsm
+++ b/toolkit/components/telemetry/pings/UninstallPing.jsm
@@ -8,9 +8,9 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   WindowsInstallsInfo:
     "resource://gre/modules/components-utils/WindowsInstallsInfo.jsm",
 });
diff --git a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
index a7b256a453f6..ebdf50baf26a 100644
--- a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
+++ b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
@@ -16,10 +16,10 @@ var EXPORTED_SYMBOLS = ["TelemetryUntrustedModulesPing"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   Log: "resource://gre/modules/Log.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TelemetryController: "resource://gre/modules/TelemetryController.jsm",
   TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
 });
diff --git a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm
index dbf4ce18c7d3..666902128730 100644
--- a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm
+++ b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.jsm
@@ -4,6 +4,7 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -14,7 +15,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   CommonUtils: "resource://services-common/utils.js",
   MockRegistrar: "resource://testing-common/MockRegistrar.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 var EXPORTED_SYMBOLS = ["TelemetryEnvironmentTesting"];
diff --git a/toolkit/components/thumbnails/PageThumbs.jsm b/toolkit/components/thumbnails/PageThumbs.jsm
index fec97a6897eb..b8773a3db653 100644
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/toolkit/components/thumbnails/PageThumbs.jsm
@@ -28,11 +28,11 @@ const { XPCOMUtils } = ChromeUtils.import(
 const { BasePromiseWorker } = ChromeUtils.import(
   "resource://gre/modules/PromiseWorker.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["FileReader"]);
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   PageThumbUtils: "resource://gre/modules/PageThumbUtils.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
 });
diff --git a/toolkit/modules/AsanReporter.jsm b/toolkit/modules/AsanReporter.jsm
index b11b7a237ba5..33bba4ed9422 100644
--- a/toolkit/modules/AsanReporter.jsm
+++ b/toolkit/modules/AsanReporter.jsm
@@ -8,12 +8,12 @@ const EXPORTED_SYMBOLS = ["AsanReporter"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   Log: "resource://gre/modules/Log.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["TextDecoder", "XMLHttpRequest"]);
diff --git a/toolkit/modules/OsEnvironment.jsm b/toolkit/modules/OsEnvironment.jsm
index ef57d609fdfc..38a13075f639 100644
--- a/toolkit/modules/OsEnvironment.jsm
+++ b/toolkit/modules/OsEnvironment.jsm
@@ -10,10 +10,10 @@ var EXPORTED_SYMBOLS = ["OsEnvironment"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
   WindowsVersionInfo:
     "resource://gre/modules/components-utils/WindowsVersionInfo.jsm",
diff --git a/toolkit/modules/Region.jsm b/toolkit/modules/Region.jsm
index a1d55c4e02d9..d8e581ec5821 100644
--- a/toolkit/modules/Region.jsm
+++ b/toolkit/modules/Region.jsm
@@ -9,6 +9,7 @@ const EXPORTED_SYMBOLS = ["Region"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
@@ -17,7 +18,6 @@ const { RemoteSettings } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   LocationHelper: "resource://gre/modules/LocationHelper.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
 
diff --git a/toolkit/modules/Sqlite.jsm b/toolkit/modules/Sqlite.jsm
index e5e4d551d6e8..f55599ada5dd 100644
--- a/toolkit/modules/Sqlite.jsm
+++ b/toolkit/modules/Sqlite.jsm
@@ -9,11 +9,11 @@ var EXPORTED_SYMBOLS = ["Sqlite"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Log: "resource://gre/modules/Log.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm
index 10e17cf57375..1e7ace2db40e 100644
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/toolkit/modules/UpdateUtils.jsm
@@ -8,11 +8,11 @@ var EXPORTED_SYMBOLS = ["UpdateUtils"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   ctypes: "resource://gre/modules/ctypes.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
   WindowsVersionInfo:
     "resource://gre/modules/components-utils/WindowsVersionInfo.jsm",
diff --git a/toolkit/modules/subprocess/test/xpcshell/head.js b/toolkit/modules/subprocess/test/xpcshell/head.js
index 967cf00f5653..47f3bef742d2 100644
--- a/toolkit/modules/subprocess/test/xpcshell/head.js
+++ b/toolkit/modules/subprocess/test/xpcshell/head.js
@@ -3,11 +3,11 @@
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // eslint-disable-next-line no-unused-vars
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   OS: "resource://gre/modules/osfile.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   Subprocess: "resource://gre/modules/Subprocess.jsm",
 });
diff --git a/toolkit/mozapps/extensions/AbuseReporter.jsm b/toolkit/mozapps/extensions/AbuseReporter.jsm
index f3724b6f55dd..588df5ea2f59 100644
--- a/toolkit/mozapps/extensions/AbuseReporter.jsm
+++ b/toolkit/mozapps/extensions/AbuseReporter.jsm
@@ -7,6 +7,7 @@ const EXPORTED_SYMBOLS = ["AbuseReporter", "AbuseReportError"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 Cu.importGlobalProperties(["fetch"]);
 
@@ -30,7 +31,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AMTelemetry: "resource://gre/modules/AddonManager.jsm",
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   ClientID: "resource://gre/modules/ClientID.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
index 661c902d031e..2f3d9c331333 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
@@ -7,13 +7,13 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   DeferredTask: "resource://gre/modules/DeferredTask.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   ServiceRequest: "resource://gre/modules/ServiceRequest.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 2004836ffd1e..9cc2ac82922f 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -9,6 +9,7 @@ var EXPORTED_SYMBOLS = ["GMPTestUtils"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -16,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   Log: "resource://gre/modules/Log.jsm",
   GMPInstallManager: "resource://gre/modules/GMPInstallManager.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
 
diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
index 9ece704fc637..07ed2388634d 100644
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@@ -19,6 +19,7 @@ var EXPORTED_SYMBOLS = ["AddonInternal", "XPIDatabase", "XPIDatabaseReconcile"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyServiceGetters(this, {
   ThirdPartyUtil: ["@mozilla.org/thirdpartyutil;1", "mozIThirdPartyUtil"],
@@ -34,7 +35,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
   PermissionsUtils: "resource://gre/modules/PermissionsUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
 
   Blocklist: "resource://gre/modules/Blocklist.jsm",
   UpdateChecker: "resource://gre/modules/addons/XPIInstall.jsm",
diff --git a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
index 6cad5d61ccc4..0a3709aeb3c9 100644
--- a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
+++ b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
@@ -17,6 +17,7 @@ const { EXIT_CODE } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
@@ -25,7 +26,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
   ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
 });
 
diff --git a/toolkit/mozapps/update/BackgroundUpdate.jsm b/toolkit/mozapps/update/BackgroundUpdate.jsm
index 036e34891aae..6e687603b8c2 100644
--- a/toolkit/mozapps/update/BackgroundUpdate.jsm
+++ b/toolkit/mozapps/update/BackgroundUpdate.jsm
@@ -10,6 +10,7 @@ var EXPORTED_SYMBOLS = ["BackgroundUpdate"];
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   BackgroundTasksUtils: "resource://gre/modules/BackgroundTasksUtils.jsm",
   BackgroundTasksManager: "resource://gre/modules/BackgroundTasksManager.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
   TaskScheduler: "resource://gre/modules/TaskScheduler.jsm",
   UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
 });