diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 252922851e..45d28cea97 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -2044,13 +2044,21 @@ class WP_Rewrite {
 	 * @access public
 	 * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
 	 */
-	public function flush_rules($hard = true) {
+	public function flush_rules( $hard = true ) {
+		static $do_hard_later;
+
 		// Prevent this action from running before everyone has registered their rewrites
 		if ( ! did_action( 'wp_loaded' ) ) {
 			add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+			$do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
 			return;
 		}
 
+		if ( isset( $do_hard_later ) ) {
+			$hard = $do_hard_later;
+			unset( $do_hard_later );
+		}
+
 		delete_option('rewrite_rules');
 		$this->wp_rewrite_rules();
 		/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e72f3ef6f6..f071f82786 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31963';
+$wp_version = '4.2-beta3-31964';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.