diff --git a/resources/skins.minerva.scripts/nightModeClasses.js b/resources/skins.minerva.scripts/nightModeClasses.js
deleted file mode 100644
index 8e4a645f6..000000000
--- a/resources/skins.minerva.scripts/nightModeClasses.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const LEGACY_NIGHT = 'skin-night-mode-clientpref-1';
-const LEGACY_AUTO = 'skin-night-mode-clientpref-2';
-const THEME_NIGHT = 'skin-theme-clientpref-night';
-const THEME_AUTO = 'skin-theme-clientpref-os';
-
-/**
- * Prepares for rename in T359983. Ensures that the new classes are present in the DOM on page load.
- * Since the controls for mobile are only on Special:MobileOptions we only worry about page load and
- * assume they won't change later on.
- */
-module.exports = function nightModeClasses() {
-	const node = document.documentElement;
-
-	if ( node.classList.contains( LEGACY_AUTO ) ) {
-		node.classList.add( THEME_AUTO );
-	}
-	if ( node.classList.contains( LEGACY_NIGHT ) ) {
-		node.classList.add( THEME_NIGHT );
-	}
-};
diff --git a/resources/skins.minerva.scripts/setup.js b/resources/skins.minerva.scripts/setup.js
index c98fc1020..9ae84e00b 100644
--- a/resources/skins.minerva.scripts/setup.js
+++ b/resources/skins.minerva.scripts/setup.js
@@ -3,7 +3,6 @@
  * It should run without errors even if MobileFrontend is not installed.
  */
 var ms = require( 'mobile.startup' ),
-	nightModeClasses = require( './nightModeClasses.js' ),
 	reportIfNightModeWasDisabledOnPage = require( './reportIfNightModeWasDisabledOnPage.js' ),
 	addPortletLink = require( './addPortletLink.js' ),
 	teleportTarget = require( 'mediawiki.page.ready' ).teleportTarget;
@@ -43,7 +42,6 @@ function init() {
 	reportIfNightModeWasDisabledOnPage(
 		document.documentElement, mw.user.options, mw.user.isNamed()
 	);
-	nightModeClasses();
 }
 
 init();
diff --git a/skin.json b/skin.json
index bdc474854..08783e700 100644
--- a/skin.json
+++ b/skin.json
@@ -519,7 +519,6 @@
 			},
 			"packageFiles": [
 				"resources/skins.minerva.scripts/setup.js",
-				"resources/skins.minerva.scripts/nightModeClasses.js",
 				"resources/skins.minerva.scripts/reportIfNightModeWasDisabledOnPage.js",
 				"resources/skins.minerva.scripts/addPortletLink.js",
 				"resources/skins.minerva.scripts/initMobile.js",