diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 8b314dcbce..f4975bbf7e 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -82,7 +82,7 @@ class WP_Editor {
 		if ( !empty($set['editor_css']) )
 			echo $set['editor_css'] . "\n";
 
-		if ( $this->can_richedit || $set['media_buttons'] ) {
+		if ( !empty($buttons) || $set['media_buttons'] ) {
 			echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools">';
 			echo $buttons;
 
@@ -475,9 +475,6 @@ class WP_Editor {
 			$qtInit = '{}';
 		}
 
-	//	reset($this->mce_settings);
-	//	$key = key($this->mce_settings);
-
 		$ref = array(
 			'plugins' => implode( ',', $this->plugins ),
 			'theme' => 'advanced',
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 8befad6b73..21e54c324a 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1739,7 +1739,7 @@ function user_can_richedit() {
 			!$is_iphone && // this includes all Safari mobile browsers
 			( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
 				!preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
-				&& 'comment.php' != $pagenow ) {
+		) {
 			$wp_rich_edit = true;
 		} else {
 			$wp_rich_edit = false;