Ticket #20871: 20871.diff

wp-admin/custom-header.php

@@ -238 +238 @@
                 if ( isset( $_POST['removeheader'] ) ) {
                         check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
                         set_theme_mod( 'header_image', 'remove-header' );
+                        remove_theme_mod( 'header_image_data' );
                         return;
                 }