diff --git a/dom/base/ScriptSettings.cpp b/dom/base/ScriptSettings.cpp
index 7f863469e0a4..0050a124174e 100644
--- a/dom/base/ScriptSettings.cpp
+++ b/dom/base/ScriptSettings.cpp
@@ -94,8 +94,6 @@ void DestroyScriptSettings()
 AutoEntryScript::AutoEntryScript(nsIGlobalObject* aGlobalObject,
                                  bool aIsMainThread,
                                  JSContext* aCx)
-  : mStack(ScriptSettingsStack::Ref())
-  , mEntry(aGlobalObject, /* aCandidate = */ true)
 {
   MOZ_ASSERT(aGlobalObject);
   if (!aCx) {
@@ -116,40 +114,18 @@ AutoEntryScript::AutoEntryScript(nsIGlobalObject* aGlobalObject,
     mCxPusher.Push(aCx);
   }
   mAc.construct(aCx, aGlobalObject->GetGlobalJSObject());
-  mStack.Push(&mEntry);
-}
-
-AutoEntryScript::~AutoEntryScript()
-{
-  MOZ_ASSERT(mStack.Incumbent() == mEntry.mGlobalObject);
-  mStack.Pop();
 }
 
 AutoIncumbentScript::AutoIncumbentScript(nsIGlobalObject* aGlobalObject)
-  : mStack(ScriptSettingsStack::Ref())
-  , mEntry(aGlobalObject, /* aCandidate = */ false)
 {
-  mStack.Push(&mEntry);
-}
-
-AutoIncumbentScript::~AutoIncumbentScript()
-{
-  MOZ_ASSERT(mStack.Incumbent() == mEntry.mGlobalObject);
-  mStack.Pop();
+  MOZ_ASSERT(aGlobalObject);
 }
 
 AutoSystemCaller::AutoSystemCaller(bool aIsMainThread)
-  : mStack(ScriptSettingsStack::Ref())
 {
   if (aIsMainThread) {
     mCxPusher.PushNull();
   }
-  mStack.PushSystem();
-}
-
-AutoSystemCaller::~AutoSystemCaller()
-{
-  mStack.Pop();
 }
 
 } // namespace dom
diff --git a/dom/base/ScriptSettings.h b/dom/base/ScriptSettings.h
index 632485959c9b..e5a25426a764 100644
--- a/dom/base/ScriptSettings.h
+++ b/dom/base/ScriptSettings.h
@@ -27,7 +27,6 @@ namespace dom {
 void InitScriptSettings();
 void DestroyScriptSettings();
 
-class ScriptSettingsStack;
 struct ScriptSettingsStackEntry {
   nsCOMPtr<nsIGlobalObject> mGlobalObject;
   bool mIsCandidateEntryPoint;
@@ -66,11 +65,8 @@ public:
                   bool aIsMainThread = NS_IsMainThread(),
                   // Note: aCx is mandatory off-main-thread.
                   JSContext* aCx = nullptr);
-  ~AutoEntryScript();
 
 private:
-  dom::ScriptSettingsStack& mStack;
-  dom::ScriptSettingsStackEntry mEntry;
   nsCxPusher mCxPusher;
   mozilla::Maybe<JSAutoCompartment> mAc; // This can de-Maybe-fy when mCxPusher
                                          // goes away.
@@ -82,10 +78,6 @@ private:
 class AutoIncumbentScript {
 public:
   AutoIncumbentScript(nsIGlobalObject* aGlobalObject);
-  ~AutoIncumbentScript();
-private:
-  dom::ScriptSettingsStack& mStack;
-  dom::ScriptSettingsStackEntry mEntry;
 };
 
 /*
@@ -96,9 +88,7 @@ private:
 class AutoSystemCaller {
 public:
   AutoSystemCaller(bool aIsMainThread = NS_IsMainThread());
-  ~AutoSystemCaller();
 private:
-  dom::ScriptSettingsStack& mStack;
   nsCxPusher mCxPusher;
 };