diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index ad5a7be..d8038aa 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -2657,6 +2657,11 @@ video#inline-media-node {
 	left: 0;
 }
 
+.edit-attachment-frame .media-frame-content {
+	border-bottom: none;
+	bottom: 0;
+}
+
 /* Hiding this for the moment instead of removing it from the template. */
 .edit-attachment-frame h3 {
 	display: none;
diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 0ebbc67..46c9449 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -25,7 +25,6 @@
 			menu:    false,
 			router:  'edit-metadata',
 			content: 'edit-metadata',
-			toolbar: 'toolbar',
 
 			url:     ''
 		},
@@ -34,10 +33,6 @@
 			media.controller._State.prototype.initialize.apply( this, arguments );
 		},
 
-		activate: function() {
-			this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
-		},
-
 		_postActivate: function() {
 			this._content();
 			this._router();
@@ -47,30 +42,6 @@
 			this.stopListening( this.frame );
 		},
 
-		toolbar: function() {
-			var frame = this.frame,
-				lastState = frame.lastState(),
-				previous = lastState && lastState.id;
-
-			frame.toolbar.set( new media.view.Toolbar({
-				controller: frame,
-				items: {
-					back: {
-						style: 'primary',
-						text:     l10n.back,
-						priority: 20,
-						click:    function() {
-							if ( previous ) {
-								frame.setState( previous );
-							} else {
-								frame.close();
-							}
-						}
-					}
-				}
-			}) );
-		},
-
 		/**
 		 * @access private
 		 */
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 098a03a..8a72e1b 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -276,7 +276,6 @@ function wp_print_media_templates() {
 		</div>
 		<div class="media-frame-router"></div>
 		<div class="media-frame-content"></div>
-		<div class="media-frame-toolbar"></div>
 	</script>
 
 	<script type="text/html" id="tmpl-attachment-details-two-column">