diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index f16e46ce3..e64a9aa3c 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1407,7 +1407,10 @@ function wp_tiny_mce( $teeny = false, $settings = false ) {
 		$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
 		$mce_buttons = implode($mce_buttons, ',');
 
-		$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
+		$mce_buttons_2 = array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' );
+		if ( is_multisite() )
+			unset( $mce_buttons_2[ array_search( 'media', $mce_buttons_2 ) ] );
+		$mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2);
 		$mce_buttons_2 = implode($mce_buttons_2, ',');
 
 		$mce_buttons_3 = apply_filters('mce_buttons_3', array());
diff --git a/wp-includes/ms-default-filters.php b/wp-includes/ms-default-filters.php
index 973f80ab0..33c36deef 100644
--- a/wp-includes/ms-default-filters.php
+++ b/wp-includes/ms-default-filters.php
@@ -19,7 +19,6 @@ add_action ( 'template_redirect', 'maybe_redirect_404' );
 add_filter ( 'allowed_redirect_hosts', 'redirect_this_site' );
 
 // Administration
-add_filter ( 'mce_buttons_2', 'remove_tinymce_media_button' );
 add_filter ( 'term_id_filter', 'global_terms', 10, 2 );
 add_action ( 'publish_post', 'update_posts_count' );
 add_action ( 'delete_post', 'wpmu_update_blogs_date' );
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 9b646ff54..8cf0b837a 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1758,11 +1758,6 @@ function maybe_redirect_404() {
 	}
 }
 
-function remove_tinymce_media_button( $buttons ) {
-	unset( $buttons[ array_search( 'media', $buttons ) ] );
-	return $buttons;
-}
-
 function maybe_add_existing_user_to_blog() {
 	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
 		return false;
@@ -1823,7 +1818,7 @@ function update_blog_public( $old_value, $value ) {
 	update_blog_status( $wpdb->blogid, 'public', (int) $value );
 }
 add_action('update_option_blog_public', 'update_blog_public', 10, 2);
-	
+
 /* Redirect all hits to "dashboard" blog to wp-admin/ Dashboard. */
 function redirect_mu_dashboard() {
 	global $current_site, $current_blog;