diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9831d094d79f..b0f687643221 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1815,7 +1815,6 @@ var gBrowserInit = {
 
     let mm = window.getGroupMessageManager("browsers");
     mm.loadFrameScript("chrome://browser/content/tab-content.js", true, true);
-    mm.loadFrameScript("chrome://browser/content/content.js", true, true);
 
     window.messageManager.addMessageListener("Browser:LoadURI", RedirectLoad);
 
diff --git a/browser/base/content/content.js b/browser/base/content/content.js
deleted file mode 100644
index 7901ebd664dd..000000000000
--- a/browser/base/content/content.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* This content script should work in any browser or iframe and should not
- * depend on the frame being contained in tabbrowser. */
-
-/* eslint-env mozilla/frame-script */
-/* eslint no-unused-vars: ["error", {args: "none"}] */
-
-// This is a temporary hack to prevent regressions (bug 1471327).
-void content;
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index d45441ac41e4..48f7e7ecb24b 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -118,3 +118,6 @@ addEventListener("MozAfterPaint", function onFirstNonBlankPaint() {
   removeEventListener("MozAfterPaint", onFirstNonBlankPaint);
   sendAsyncMessage("Browser:FirstNonBlankPaint");
 });
+
+// This is a temporary hack to prevent regressions (bug 1471327).
+void content;
diff --git a/browser/base/content/webext-panels.js b/browser/base/content/webext-panels.js
index 5dec4b997523..cb44ed00eac6 100644
--- a/browser/base/content/webext-panels.js
+++ b/browser/base/content/webext-panels.js
@@ -70,11 +70,6 @@ function getBrowser(panel) {
   stack.appendChild(browser);
 
   return readyPromise.then(() => {
-    browser.messageManager.loadFrameScript(
-      "chrome://browser/content/content.js",
-      false,
-      true
-    );
     ExtensionParent.apiManager.emit(
       "extension-browser-inserted",
       browser,
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index d38b301ffc9b..9994623d304b 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -62,7 +62,6 @@ browser.jar:
         content/browser/browser-thumbnails.js         (content/browser-thumbnails.js)
         content/browser/browser-graphics-utils.js     (content/browser-graphics-utils.js)
         content/browser/tab-content.js                (content/tab-content.js)
-        content/browser/content.js                    (content/content.js)
         content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
         content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
         content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
diff --git a/browser/components/extensions/ExtensionPopups.jsm b/browser/components/extensions/ExtensionPopups.jsm
index dad1410fac41..3a17a85b82ed 100644
--- a/browser/components/extensions/ExtensionPopups.jsm
+++ b/browser/components/extensions/ExtensionPopups.jsm
@@ -351,9 +351,6 @@ class BasePopup {
       setupBrowser(browser);
       let mm = browser.messageManager;
 
-      // Sets the context information for context menus.
-      mm.loadFrameScript("chrome://browser/content/content.js", true, true);
-
       mm.loadFrameScript(
         "chrome://extensions/content/ext-browser-content.js",
         false,
diff --git a/toolkit/components/extensions/ext-browser-content.js b/toolkit/components/extensions/ext-browser-content.js
index 44167c3c8d56..649ce6fa5e42 100644
--- a/toolkit/components/extensions/ext-browser-content.js
+++ b/toolkit/components/extensions/ext-browser-content.js
@@ -373,3 +373,6 @@ if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
     .getInterface(Ci.nsIBrowserChild);
   tabchild.webBrowserChrome = WebBrowserChrome;
 }
+
+// This is a temporary hack to prevent regressions (bug 1471327).
+void content;
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
index 688959c05da7..d14b4f0fba98 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.js
+++ b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -1258,7 +1258,6 @@ class InlineOptionsBrowser extends HTMLElement {
         false,
         true
       );
-      mm.loadFrameScript("chrome://browser/content/content.js", false, true);
       mm.addMessageListener("Extension:BrowserContentLoaded", messageListener);
       mm.addMessageListener("Extension:BrowserResized", messageListener);