diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index a12f6507d0..d6b4f03002 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -2787,7 +2787,8 @@ function edit_form_image_editor( $post ) {
 function attachment_submitbox_metadata() {
 	$post = get_post();
 
-	$filename = esc_html( wp_basename( $post->guid ) );
+	$file = get_attached_file( $post->ID );
+	$filename = esc_html( wp_basename( $file ) );
 
 	$media_dims = '';
 	$meta = wp_get_attachment_metadata( $post->ID );
@@ -2822,7 +2823,6 @@ function attachment_submitbox_metadata() {
 	</div>
 
 	<?php
-		$file  = get_attached_file( $post->ID );
 		$file_size = false;
 
 		if ( isset( $meta['filesize'] ) )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e182844e7f..252488a332 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34170';
+$wp_version = '4.4-alpha-34171';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.