--- a/dom/base/PopupBlocker.cpp
+++ b/dom/base/PopupBlocker.cpp
@@ -22,20 +22,16 @@ namespace {
 static char* sPopupAllowedEvents;
 
 static PopupBlocker::PopupControlState sPopupControlState =
     PopupBlocker::openAbused;
 static uint32_t sPopupStatePusherCount = 0;
 
 static TimeStamp sLastAllowedExternalProtocolIFrameTimeStamp;
 
-// This token is by default set to false. When a popup/filePicker is shown, it
-// is set to true.
-static bool sUnusedPopupToken = false;
-
 static uint32_t sOpenPopupSpamCount = 0;
 
 void PopupAllowedEventsChanged() {
   if (sPopupAllowedEvents) {
     free(sPopupAllowedEvents);
   }
 
   nsAutoCString str;
@@ -127,41 +123,22 @@ uint32_t PopupBlocker::GetPopupPermissio
     permissionManager->TestPermissionFromPrincipal(aPrincipal, "popup"_ns,
                                                    &permit);
   }
 
   return permit;
 }
 
 /* static */
-bool PopupBlocker::TryUsePopupOpeningToken(nsIPrincipal* aPrincipal) {
-  MOZ_ASSERT(sPopupStatePusherCount);
-
-  if (!sUnusedPopupToken) {
-    sUnusedPopupToken = true;
-    return true;
-  }
-
-  if (aPrincipal && aPrincipal->IsSystemPrincipal()) {
-    return true;
-  }
-
-  return false;
-}
-
-/* static */
 void PopupBlocker::PopupStatePusherCreated() { ++sPopupStatePusherCount; }
 
 /* static */
 void PopupBlocker::PopupStatePusherDestroyed() {
   MOZ_ASSERT(sPopupStatePusherCount);
-
-  if (!--sPopupStatePusherCount) {
-    sUnusedPopupToken = false;
-  }
+  --sPopupStatePusherCount;
 }
 
 // static
 PopupBlocker::PopupControlState PopupBlocker::GetEventPopupControlState(
     WidgetEvent* aEvent, Event* aDOMEvent) {
   // generally if an event handler is running, new windows are disallowed.
   // check for exceptions:
   PopupBlocker::PopupControlState abuse = PopupBlocker::openAbused;

--- a/dom/base/PopupBlocker.h
+++ b/dom/base/PopupBlocker.h
@@ -41,23 +41,16 @@ class PopupBlocker final {
 
   static PopupControlState GetPopupControlState();
 
   static void PopupStatePusherCreated();
   static void PopupStatePusherDestroyed();
 
   static uint32_t GetPopupPermission(nsIPrincipal* aPrincipal);
 
-  // This method returns true if the caller is allowed to show a popup, and it
-  // consumes the popup token for the current event. There is just 1 popup
-  // allowed per event.
-  // This method returns true if the token has been already consumed but
-  // aPrincipal is the system principal.
-  static bool TryUsePopupOpeningToken(nsIPrincipal* aPrincipal);
-
   static PopupBlocker::PopupControlState GetEventPopupControlState(
       WidgetEvent* aEvent, Event* aDOMEvent = nullptr);
 
   // Returns if a external protocol iframe is allowed.
   static bool ConsumeTimerTokenForExternalProtocolIframe();
 
   // Returns when the last external protocol iframe has been allowed.
   static TimeStamp WhenLastExternalProtocolIframeAllowed();

--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -5761,17 +5761,20 @@ PopupBlocker::PopupControlState nsGlobal
     }
   }
 
   // If this popup is allowed, let's block any other for this event, forcing
   // PopupBlocker::openBlocked state.
   if ((abuse == PopupBlocker::openAllowed ||
        abuse == PopupBlocker::openControlled) &&
       StaticPrefs::dom_block_multiple_popups() && !IsPopupAllowed() &&
-      !PopupBlocker::TryUsePopupOpeningToken(mDoc->NodePrincipal())) {
+      !mDoc->ConsumeTransientUserGestureActivation()) {
+    nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, "DOM"_ns, mDoc,
+                                    nsContentUtils::eDOM_PROPERTIES,
+                                    "MultiplePopupsBlockedNoUserActivation");
     abuse = PopupBlocker::openBlocked;
   }
 
   return abuse;
 }
 
 /* If a window open is blocked, fire the appropriate DOM events. */
 void nsGlobalWindowOuter::FireAbuseEvents(

--- a/dom/base/test/browser_multiple_popups.js
+++ b/dom/base/test/browser_multiple_popups.js
@@ -157,17 +157,17 @@ add_task(async _ => {
 
   let browser = gBrowser.getBrowserForTab(tab);
   await BrowserTestUtils.browserLoaded(browser);
 
   let obs = new WindowObserver(2);
 
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#input",
-    { type: "mouseup" },
+    {},
     tab.linkedBrowser
   );
 
   await obs;
   ok(true, "We had 2 windows.");
 
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#closeAllWindows",
@@ -276,17 +276,17 @@ add_task(async _ => {
       );
     });
   });
 
   let obs = new WindowObserver(1);
 
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#input",
-    { type: "mouseup" },
+    {},
     tab.linkedBrowser
   );
 
   await p;
   await obs;
   ok(true, "We had only 1 window.");
 
   await BrowserTestUtils.synthesizeMouseAtCenter(

--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -402,8 +402,9 @@ RequestStorageAccessUserGesture=document
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented=Too many calls to Location or History APIs within a short timeframe.
 FolderUploadPrompt.title = Confirm Upload
 # LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
 FolderUploadPrompt.message = Are you sure you want to upload all files from “%S”? Only do this if you trust the site.
 FolderUploadPrompt.acceptButtonLabel = Upload
 InputPickerBlockedNoUserActivation=<input> picker was blocked due to lack of user activation.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe with external protocol was blocked due to lack of user activation, or because not enough time has passed since the last such iframe was loaded.
+MultiplePopupsBlockedNoUserActivation=Opening multiple popups was blocked due to lack of user activation.