Index: src/wp-admin/includes/schema.php
===================================================================
--- src/wp-admin/includes/schema.php	(revision 43577)
+++ src/wp-admin/includes/schema.php	(working copy)
@@ -186,8 +186,7 @@
   KEY post_author (post_author)
 ) $charset_collate;\n";
 
-	// Single site users table. The multisite flavor of the users table is handled below.
-	$users_single_table = "CREATE TABLE $wpdb->users (
+	$users_table = "CREATE TABLE $wpdb->users (
   ID bigint(20) unsigned NOT NULL auto_increment,
   user_login varchar(60) NOT NULL default '',
   user_pass varchar(255) NOT NULL default '',
@@ -198,24 +197,6 @@
   user_activation_key varchar(255) NOT NULL default '',
   user_status int(11) NOT NULL default '0',
   display_name varchar(250) NOT NULL default '',
-  PRIMARY KEY  (ID),
-  KEY user_login_key (user_login),
-  KEY user_nicename (user_nicename),
-  KEY user_email (user_email)
-) $charset_collate;\n";
-
-	// Multisite users table
-	$users_multi_table = "CREATE TABLE $wpdb->users (
-  ID bigint(20) unsigned NOT NULL auto_increment,
-  user_login varchar(60) NOT NULL default '',
-  user_pass varchar(255) NOT NULL default '',
-  user_nicename varchar(50) NOT NULL default '',
-  user_email varchar(100) NOT NULL default '',
-  user_url varchar(100) NOT NULL default '',
-  user_registered datetime NOT NULL default '0000-00-00 00:00:00',
-  user_activation_key varchar(255) NOT NULL default '',
-  user_status int(11) NOT NULL default '0',
-  display_name varchar(250) NOT NULL default '',
   spam tinyint(2) NOT NULL default '0',
   deleted tinyint(2) NOT NULL default '0',
   PRIMARY KEY  (ID),
@@ -236,11 +217,7 @@
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite ) {
-		$global_tables = $users_multi_table . $usermeta_table;
-	} else {
-		$global_tables = $users_single_table . $usermeta_table;
-	}
+	$global_tables = $users_table . $usermeta_table;
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (