Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 22470)
+++ wp-admin/options-permalink.php	(working copy)
@@ -71,8 +71,6 @@
 }
 add_filter('admin_head', 'options_permalink_add_js');
 
-include('./admin-header.php');
-
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
 
@@ -115,7 +113,8 @@
 		$wp_rewrite->set_tag_base( $tag_base );
 	}
 
-	create_initial_taxonomies();
+	wp_redirect( admin_url( 'options-permalink.php?updated=true' ) );
+	exit;
 }
 
 $permalink_structure = get_option('permalink_structure');
@@ -141,7 +140,9 @@
 
 flush_rewrite_rules();
 
-if (isset($_POST['submit'])) : ?>
+include('./admin-header.php');
+
+if ( ! empty( $_GET['updated'] ) ) : ?>
 <div id="message" class="updated"><p><?php
 if ( ! is_multisite() ) {
 	if ( $iis7_permalinks ) {