diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index ddb5e1374e..8b0fe48747 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -334,11 +334,10 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
 		return $value;
 
 	if ( 'edit' == $context ) {
-		$format_to_edit = array('link_notes');
 		$value = apply_filters("edit_$field", $value, $bookmark_id);
 
-		if ( in_array($field, $format_to_edit) ) {
-			$value = format_to_edit($value);
+		if ( 'link_notes' == $field ) {
+			$value = esc_html( $value ); // textarea_escaped
 		} else {
 			$value = esc_attr($value);
 		}
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 32f77e4131..8dbf8aab5f 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -1521,7 +1521,7 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
 		$value = apply_filters("edit_term_{$field}", $value, $term_id, $taxonomy);
 		$value = apply_filters("edit_{$taxonomy}_{$field}", $value, $term_id);
 		if ( 'description' == $field )
-			$value = format_to_edit($value);
+			$value = esc_html($value); // textarea_escaped
 		else
 			$value = esc_attr($value);
 	} else if ( 'db' == $context ) {