Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 17521)
+++ wp-includes/post.php	(working copy)
@@ -19,7 +19,7 @@
 function create_initial_post_types() {
 	register_post_type( 'post', array(
 		'public'  => true,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
+		'menu_position' => 5,
 		'_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
 		'capability_type' => 'post',
 		'map_meta_cap' => true,
Index: wp-admin/menu.php
===================================================================
--- wp-admin/menu.php	(revision 17521)
+++ wp-admin/menu.php	(working copy)
@@ -62,20 +62,6 @@
 
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
-$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
-	$submenu['edit.php'][5]  = array( __('Posts'), 'edit_posts', 'edit.php' );
-	/* translators: add new post */
-	$submenu['edit.php'][10]  = array( _x('Add New', 'post'), 'edit_posts', 'post-new.php' );
-
-	$i = 15;
-	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! in_array('post', (array) $tax->object_type, true) )
-			continue;
-
-		$submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name );
-	}
-	unset($tax);
-
 $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'div' );
 	$submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
 	/* translators: add new file */
@@ -114,6 +100,7 @@
 		continue;
 	$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
 	$ptype_for_id = sanitize_html_class( $ptype );
+
 	if ( is_string( $ptype_obj->menu_icon ) ) {
 		$menu_icon   = esc_url( $ptype_obj->menu_icon );
 		$ptype_class = $ptype_for_id;
@@ -122,12 +109,18 @@
 		$ptype_class = 'post';
 	}
 
+	$menu_class = 'menu-top menu-icon-' . $ptype_class;
+	// 'post' special case
+	if ( 'post' == $ptype )
+		$menu_class .= ' open-if-no-js';
+
 	// if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position.
 	$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
 	while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
 		$ptype_menu_position++;
 
-	$menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
+	$menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', $menu_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
+
 	$submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
 	$submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->edit_posts, "post-new.php?post_type=$ptype" );
 
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 17521)
+++ wp-admin/edit.php	(working copy)
@@ -35,15 +35,9 @@
 }
 unset( $_redirect );
 
-if ( 'post' != $post_type ) {
-	$parent_file = "edit.php?post_type=$post_type";
-	$submenu_file = "edit.php?post_type=$post_type";
-	$post_new_file = "post-new.php?post_type=$post_type";
-} else {
-	$parent_file = 'edit.php';
-	$submenu_file = 'edit.php';
-	$post_new_file = 'post-new.php';
-}
+$parent_file = "edit.php?post_type=$post_type";
+$submenu_file = "edit.php?post_type=$post_type";
+$post_new_file = "post-new.php?post_type=$post_type";
 
 $doaction = $wp_list_table->current_action();