diff --git a/includes/templates/Indicators.mustache b/includes/templates/Indicators.mustache
index 6e1cc7b91..ccd5d9828 100644
--- a/includes/templates/Indicators.mustache
+++ b/includes/templates/Indicators.mustache
@@ -1,5 +1,5 @@
 {{! @typedef Indicator[]}}
-<div class="mw-indicators mw-body-content">
+<div class="mw-indicators">
 {{#array-indicators}}
 <div id="{{id}}" class="{{class}}">{{{html}}}</div>
 {{/array-indicators}}
diff --git a/includes/templates/skin-legacy.mustache b/includes/templates/skin-legacy.mustache
index b72867456..d75c949d5 100644
--- a/includes/templates/skin-legacy.mustache
+++ b/includes/templates/skin-legacy.mustache
@@ -29,10 +29,10 @@
 <div id="mw-head-base" class="noprint"></div>
 <div id="content" class="mw-body" role="main">
 	<a id="top"></a>
-	<div id="siteNotice" class="mw-body-content">{{{html-site-notice}}}</div>
+	<div id="siteNotice">{{{html-site-notice}}}</div>
 	{{>Indicators}}
 	<h1 id="firstHeading" class="firstHeading" {{{html-user-language-attributes}}}>{{{html-title}}}</h1>
-	<div id="bodyContent" class="mw-body-content">
+	<div id="bodyContent">
 		{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
 		<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
 		<div id="contentSub2">{{{html-undelete-link}}}</div>
diff --git a/includes/templates/skin.mustache b/includes/templates/skin.mustache
index 2550e9c43..964c6cd49 100644
--- a/includes/templates/skin.mustache
+++ b/includes/templates/skin.mustache
@@ -48,7 +48,7 @@
 {{! `role` is unnecessary but kept to support selectors in any gadgets or user styles. }}
 <main id="content" class="mw-body" role="main">
 	<a id="top"></a>
-	<div id="siteNotice" class="mw-body-content">{{{html-site-notice}}}</div>
+	<div id="siteNotice">{{{html-site-notice}}}</div>
 
 	{{^is-language-in-header}}
 	{{>Indicators}}
@@ -70,7 +70,7 @@
 	</header>
 	{{/is-language-in-header}}
 
-	<div id="bodyContent" class="mw-body-content">
+	<div id="bodyContent">
 		{{^is-language-in-header}}
 			{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
 		{{/is-language-in-header}}
diff --git a/skin.json b/skin.json
index 0c2451e8f..538f8cfdc 100644
--- a/skin.json
+++ b/skin.json
@@ -100,7 +100,6 @@
 		"skins.vector.styles.legacy": {
 			"class": "ResourceLoaderSkinModule",
 			"features": {
-				"content-parser-output": true,
 				"normalize": true,
 				"elements": true,
 				"content": true,
@@ -124,8 +123,7 @@
 				"elements": true,
 				"content": true,
 				"interface": true,
-				"legacy": true,
-				"content-parser-output": true
+				"legacy": true
 			},
 			"targets": [
 				"desktop",