Index: src/wp-includes/class-wp-customize-control.php
===================================================================
--- src/wp-includes/class-wp-customize-control.php	(revision 30840)
+++ src/wp-includes/class-wp-customize-control.php	(working copy)
@@ -708,7 +708,7 @@
 			if ( $this->value() ) {
 				$attachment_id = attachment_url_to_postid( $this->value() );
 				if ( $attachment_id ) {
-					$this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id);
+					$this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id );
 				}
 			} else if ( $this->setting->default ) {
 				// Set the default as the attachment.
@@ -741,12 +741,7 @@
 			<# } #>
 		</label>
 
-		<# // Ensure that the default attachment is used if it exists.
-		if ( _.isEmpty( data.attachment ) && data.defaultAttachment ) {
-			data.attachment = data.defaultAttachment;
-		}
-
-		if ( data.attachment && data.attachment.id ) { #>
+		<# if ( data.attachment && data.attachment.id ) { #>
 			<div class="current">
 				<div class="container">
 					<div class="attachment-media-view attachment-media-view-{{ data.attachment.type }} {{ data.attachment.orientation }}">
@@ -773,11 +768,10 @@
 				</div>
 			</div>
 			<div class="actions">
-				<# if ( data.defaultAttachment && data.defaultAttachment.id !== data.attachment.id ) { #>
+				<# if ( data.defaultAttachment ) { #>
 					<button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
-				<# } else if ( ! data.defaultAttachment ) { #>
-					<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
 				<# } #>
+				<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
 				<button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['change']; ?></button>
 				<div style="clear:both"></div>
 			</div>
@@ -1177,4 +1171,3 @@
 		return $this->manager->widgets->is_widget_rendered( $this->widget_id );
 	}
 }
-