diff --git a/includes/CommentFormatter.php b/includes/CommentFormatter.php
index 9c9da436a..512556369 100644
--- a/includes/CommentFormatter.php
+++ b/includes/CommentFormatter.php
@@ -105,14 +105,6 @@ class CommentFormatter {
 		$subscribeButton = $doc->createComment( '__DTSUBSCRIBEBUTTONDESKTOP__' . $headingNameEscaped );
 		$headingElement->insertBefore( $subscribeButton, $headingElement->firstChild );
 
-		// TEMPORARY: If enhancements are "unavailable", don't modify the HTML at all
-		// so as to avoid polluting the parser cache. Once the HTML output is more stable
-		// this can be removed.
-		$dtConfig = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'discussiontools' );
-		if ( $dtConfig->get( 'DiscussionTools_' . HookUtils::VISUALENHANCEMENTS ) === 'unavailable' ) {
-			return;
-		}
-
 		// Visual enhancements: topic containers
 		$summary = $headingItem->getThreadSummary();
 		if ( $summary['commentCount'] ) {
diff --git a/includes/Hooks/HookUtils.php b/includes/Hooks/HookUtils.php
index 1dc9926a5..7ae436c79 100644
--- a/includes/Hooks/HookUtils.php
+++ b/includes/Hooks/HookUtils.php
@@ -275,9 +275,7 @@ class HookUtils {
 			// Extra hack for parses from API, where this parameter isn't passed to derivative requests
 			RequestContext::getMain()->getRequest()->getRawVal( 'dtenable' );
 
-		// TEMPORARY: Don't enable visualenhancements by query as the HTML in the parser
-		// cache will not have been modified (see CommentFormatter::addTopicContainer)
-		if ( $queryEnable && $feature !== static::VISUALENHANCEMENTS ) {
+		if ( $queryEnable ) {
 			return true;
 		}