diff --git a/wp-includes/class-wp-customize.php b/wp-includes/class-wp-customize.php
index 9eabe31048..e97c547b43 100644
--- a/wp-includes/class-wp-customize.php
+++ b/wp-includes/class-wp-customize.php
@@ -534,13 +534,10 @@ final class WP_Customize {
 		// Input type: checkbox
 		// With custom value
 		$this->add_setting( 'header_image', array(
-			'label'   => 'Random Image',
+			'label'   => 'Header Image',
 			'section' => 'header',
-			'control' => 'checkbox',
-			 // @todo
-			 // not the default, it's the value.
-			 // value is saved in get_theme_support( 'custom-header', 'random-default' )
-			'default' => 'random-default-image'
+			'control' => 'upload',
+			'default' => get_theme_support( 'custom-header', 'default-image' ),
 		) );
 
 		/* Custom Background */
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index 315211ec9e..79c64cfa0f 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -278,6 +278,10 @@
 		api( 'background_image', function( control ) {
 			control.uploader.param( 'post_data[context]', 'custom-background' );
 		});
+
+		api( 'header_image', function( control ) {
+			control.uploader.param( 'post_data[context]', 'custom-header' );
+		});
 	});
 
 })( wp, jQuery );
\ No newline at end of file