diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 81c5e36dbb..a17ed501fa 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -955,7 +955,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 
 	$rows = "rows='$rows'";	?>
 	<div id="editor-toolbar">
-	<?php if ( user_can_richedit() && $media_buttons ) {
+	<?php if ( user_can_richedit() ) {
 		$wp_default_editor = wp_default_editor(); ?>
 		<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
 		<?php if ( 'tinymce' == $wp_default_editor ) {
@@ -967,8 +967,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 			<a id="edButtonHTML" class="active"><?php _e('HTML'); ?></a>
 			<a id="edButtonPreview" onclick="switchEditors.go('<?php echo $id; ?>');"><?php _e('Visual'); ?></a>
 		<?php }
-	} else
-		add_filter('the_editor_content', 'wp_htmledit_pre');
+	}
 
 /*	if ( $media_buttons ) { ?>
 		<div id="media-buttons" class="hide-if-no-js">