diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
index 1dc8c9f6e9eb..ca6e91511d54 100644
--- a/browser/base/content/global-scripts.inc
+++ b/browser/base/content/global-scripts.inc
@@ -18,15 +18,12 @@ xmlns="http://www.w3.org/1999/xhtml"
 >
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-for (let script of [
-  "chrome://browser/content/browser.js",
-  "chrome://browser/content/browser-places.js",
-  "chrome://global/content/globalOverlay.js",
-  "chrome://browser/content/utilityOverlay.js",
+Services.scriptloader.loadSubScript("chrome://browser/content/browser.js", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/browser-places.js", this);
+Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/utilityOverlay.js", this);
 #ifdef XP_MACOSX
-  "chrome://global/content/macWindowMenu.js",
+Services.scriptloader.loadSubScript("chrome://global/content/macWindowMenu.js", this);
 #endif
-]) {
-  Services.scriptloader.loadSubScript(script, this);
-}
+
 </script>
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js
index 704d2519dac0..5d9e07f5955f 100644
--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js
@@ -51,7 +51,7 @@ const MAPPINGS = {
 };
 
 const globalScriptsRegExp =
-  /^\s*(?:Services.scriptloader.loadSubScript\(\"(.*?)\", this\);|"(.*?\.js)",)$/;
+  /^\s*Services.scriptloader.loadSubScript\(\"(.*?)\", this\);$/;
 
 function getGlobalScriptIncludes(scriptPath) {
   let fileData;
@@ -69,7 +69,7 @@ function getGlobalScriptIncludes(scriptPath) {
   for (let line of fileData) {
     let match = line.match(globalScriptsRegExp);
     if (match) {
-      let sourceFile = (match[1] || match[2])
+      let sourceFile = match[1]
                 .replace("chrome://browser/content/search/", "browser/components/search/content/")
                 .replace("chrome://browser/content/", "browser/base/content/")
                 .replace("chrome://global/content/", "toolkit/content/");