Index: class-wp-query.php
===================================================================
--- class-wp-query.php	(revision 42207)
+++ class-wp-query.php	(working copy)
@@ -1828,12 +1828,6 @@
 			$q['comments_per_page'] = get_option( 'comments_per_page' );
 		}
 
-		if ( $this->is_home && ( empty( $this->query ) || $q['preview'] == 'true' ) && ( 'page' == get_option( 'show_on_front' ) ) && get_option( 'page_on_front' ) ) {
-			$this->is_page = true;
-			$this->is_home = false;
-			$q['page_id']  = get_option( 'page_on_front' );
-		}
-
 		if ( isset( $q['page'] ) ) {
 			$q['page'] = trim( $q['page'], '/' );
 			$q['page'] = absint( $q['page'] );