diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 580d2046ed..ac3d25aaf8 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1489,7 +1489,7 @@ function _remove_theme_support( $feature ) {
 
 	switch ( $feature ) {
 		case 'custom-header' :
-			if ( false === did_action( 'wp_loaded', '_custom_header_background_just_in_time' ) )
+			if ( ! did_action( 'wp_loaded' ) )
 				break;
 			$support = get_theme_support( 'custom-header' );
 			if ( $support[0]['wp-head-callback'] )
@@ -1499,7 +1499,7 @@ function _remove_theme_support( $feature ) {
 			break;
 
 		case 'custom-background' :
-			if ( false === did_action( 'wp_loaded', '_custom_header_background_just_in_time' ) )
+			if ( ! did_action( 'wp_loaded' ) )
 				break;
 			$support = get_theme_support( 'custom-background' );
 			remove_action( 'wp_head', $support[0]['wp-head-callback'] );