Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 33249)
+++ wp-includes/theme.php	(working copy)
@@ -1942,8 +1942,10 @@
 	$header_image = get_header_image();
 	$background_image = get_background_image();
 
-	if ( $header_image && $header_image == $attachment_image )
+	if ( $header_image && $header_image == $attachment_image ) {
 		remove_theme_mod( 'header_image' );
+		remove_theme_mod( 'header_image_data' );
+	}
 
 	if ( $background_image && $background_image == $attachment_image )
 		remove_theme_mod( 'background_image' );