diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 9e2ad1506c..ae02621539 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -117,12 +117,6 @@ final class _WP_Editors {
 			// A cookie (set when a user resizes the editor) overrides the height.
 			$cookie = (int) get_user_setting( 'ed_size' );
 
-			// Upgrade an old TinyMCE cookie if it is still around, and the new one isn't.
-			if ( ! $cookie && isset( $_COOKIE['TinyMCE_content_size'] ) ) {
-				parse_str( $_COOKIE['TinyMCE_content_size'], $cookie );
- 				$cookie = $cookie['ch'];
-			}
-
 			if ( $cookie )
 				$set['editor_height'] = $cookie;
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6a3780e317..df1563f041 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-RC1-32164';
+$wp_version = '4.2-RC1-32166';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.