diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 4c1b288..8d56c9f 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -28,7 +28,7 @@
 		<main id="content" class="mw-body">
 			{{#hasheadingholder}}
 			{{{prebodyhtml}}}
-			<div class="pre-content heading-holder heading-holder--new">
+			<div class="pre-content heading-holder">
 				{{{headinghtml}}}
 				{{{taglinehtml}}}
 				{{#tabs}}
diff --git a/minerva.less/minerva.variables.less b/minerva.less/minerva.variables.less
index eb08eb9..7526935 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -46,8 +46,6 @@
 @titleSectionSpacingBottom: 25px;
 
 // Page actions
-@pageActionsGutter: 0.5em;
-@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
 @tabBorderSize: ( 1em / 16px ) * 2;
 @taglineFontSize: 0.85em;
 
diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less
index baf1c3d..b1789dc 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -2,28 +2,9 @@
 @import '../../minerva.less/minerva.mixins';
 
 .heading-holder {
-	@pageActionsGutter: 0.5em;
-	@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
-	// FIXME: padding-bottom can be removed when work on T212216
-	// has been deployed and varnish cache cleared.
-	padding: @titleSectionSpacingTop 0 (@pageActionsHeight + @pageActionsGutter);
+	padding: @titleSectionSpacingTop 0 0;
 	position: relative;
 
-	// FIXME: Can be made default when work on T212216
-	// has been deployed and varnish cache cleared.
-	&--new {
-		padding-bottom: 0;
-	}
-	// FIXME: Can be removed when work on T212216
-	// has been deployed and varnish cache cleared.
-	&--no-page-actions {
-		padding-bottom: @pageActionsGutter;
-
-		&--new {
-			padding-bottom: 0;
-		}
-	}
-
 	.tagline {
 		color: @colorGray5;
 		font-size: @taglineFontSize;