diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 44343569a6..db93c577d8 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -3095,7 +3095,7 @@ function _remove_theme_support( $feature ) {
 				return false;
 			}
 			add_theme_support( 'custom-header', array( 'uploads' => false ) );
-			return; // Do not continue - custom-header-uploads no longer exists.
+			return true; // Do not continue - custom-header-uploads no longer exists.
 	}
 
 	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 044ca6794e..753b73b8ad 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-beta1-61720';
+$wp_version = '7.0-beta1-61721';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.