diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 064b30aa20..0d9008a451 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -577,8 +577,6 @@ endif; ?>
 
 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
 
-<!--<div id="add-media-button"><a id="add-media-link" href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Insert Media' ); ?></a></div>-->
-
 <?php the_editor($post->post_content); ?>
 
 <div id="post-status-info">
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 9c6a664bf0..cfa45f2967 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1483,6 +1483,9 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 	if (($rows < 3) || ($rows > 100))
 		$rows = 12;
 
+	if ( !current_user_can( 'upload_files' ) )
+		$media_buttons = false;
+
 	$richedit =  user_can_richedit();
 	$rows = "rows='$rows'";