diff --git a/wp-includes/media.php b/wp-includes/media.php
index ba52555932..deb18a40b6 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -3063,6 +3063,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
 		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
+	$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
 
 	$response = array(
 		'id'          => $attachment->ID,
@@ -3170,9 +3171,6 @@ function wp_prepare_attachment_for_js( $attachment ) {
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
 			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
-
 				// Nothing from the filter, so consult image metadata if we have it.
 				$size_meta = $meta['sizes'][ $size ];
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f2594f5321..317e4a9adb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7.1-alpha-39653';
+$wp_version = '4.7.1-alpha-39654';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.