diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index 3439b1d73b..c0c9e6974d 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -249,10 +249,13 @@
 		});
 
 		// Background color uses postMessage by default
-		api('background_color').method = 'postMessage';
+		api( 'background_color', function( control ) {
+			control.method = 'postMessage';
+		});
 
-		// api('background_image').method = 'postMessage';
-		api('background_image').uploader.param( 'post_data[context]', 'custom-background' );
+		api( 'background_image', function( control ) {
+			control.uploader.param( 'post_data[context]', 'custom-background' );
+		});
 	});
 
 })( wp, jQuery );
\ No newline at end of file
diff --git a/wp-includes/js/customize-preview.dev.js b/wp-includes/js/customize-preview.dev.js
index fefc06b51c..836d265749 100644
--- a/wp-includes/js/customize-preview.dev.js
+++ b/wp-includes/js/customize-preview.dev.js
@@ -68,8 +68,10 @@
 
 		body = $(document.body);
 		// Auto update background color by default
-		api.bind( 'background_color', function( to ) {
-			body.css( 'background-color', '#' + to );
+		api( 'background_color', function( value ) {
+			value.bind( function( to ) {
+				body.css( 'background-color', '#' + to );
+			});
 		});
 	});