Index: src/wp-includes/class-wp-editor.php
===================================================================
--- src/wp-includes/class-wp-editor.php	(revision 38946)
+++ src/wp-includes/class-wp-editor.php	(working copy)
@@ -557,11 +557,9 @@
 					// Disable H1 in the drop-down and the menu.
 					'block_formats' => 
 						'Paragraph=p;' .
-						'Heading 2=h2;' .
-						'Heading 3=h3;' .
-						'Heading 4=h4;' .
-						'Heading 5=h5;' .
-						'Heading 6=h6;' .
+						'Heading 1=h2;' .
+						'Heading 2=h3;' .
+						'Heading 3=h4;' .
 						'Preformatted=pre',
 
 					'end_container_on_empty_block' => true,
Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(revision 38946)
+++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(working copy)
@@ -576,9 +576,15 @@
 			each( editor.theme.panel.find('listbox'), function( listbox ) {
 				if ( listbox && listbox.settings.text === 'Paragraph' ) {
 					each( listbox.settings.values, function( item ) {
-						if ( item.text && labels.hasOwnProperty( item.text ) ) {
-							item.shortcut = '(' + labels[ item.text ] + ')';
+						var label = item.text;
+
+						if ( /h\d/.test( item.value ) ) {
+							label = 'Heading ' + item.value.substr( 1 );
 						}
+
+						if ( label && labels.hasOwnProperty( label ) ) {
+							item.shortcut = '(' + labels[ label ] + ')';
+						}
 					} );
 				}
 			} );