4 files changed, 12 insertions, 10 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 970c0488a..99033a326 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -940,7 +940,7 @@ function system_modules_submit($form, &$form_state) {
     drupal_install_modules($new_modules);
   }
 
-  $current_module_list = module_list(TRUE, FALSE);
+  $current_module_list = module_list(TRUE);
   if ($old_module_list != $current_module_list) {
     drupal_set_message(t('The configuration options have been saved.'));
   }
diff --git a/modules/system/system.install b/modules/system/system.install
index bcde1b943..ae9cd81cd 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1208,12 +1208,6 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
-      'bootstrap' => array(
-        'description' => "Boolean indicating whether this module is loaded during Drupal's early bootstrapping phase (e.g. even before the page cache is consulted).",
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
       'schema_version' => array(
         'description' => "The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed.",
         'type' => 'int',
@@ -1236,7 +1230,6 @@ function system_schema() {
     'primary key' => array('filename'),
     'indexes' => array(
       'modules' => array(array('type', 12), 'status', 'weight', 'filename'),
-      'bootstrap' => array(array('type', 12), 'status', 'bootstrap', 'weight', 'filename'),
     ),
   );
 
@@ -3131,6 +3124,15 @@ function system_update_7013() {
 }
 
 /**
+ * Drop the bootstrap column from the {system} table.
+ */
+function system_update_7014() {
+  $ret = array();
+  db_drop_field($ret, 'system', 'bootstrap');
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
diff --git a/modules/system/system.module b/modules/system/system.module
index 151c26979..833e54556 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1088,7 +1088,7 @@ function system_theme_data() {
       $theme->owner = '';
     }
 
-    db_query("INSERT INTO {system} (name, owner, info, type, filename, status, bootstrap) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d)", $theme->name, $theme->owner, serialize($theme->info), 'theme', $theme->filename, isset($theme->status) ? $theme->status : 0, 0);
+    db_query("INSERT INTO {system} (name, owner, info, type, filename, status) VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $theme->name, $theme->owner, serialize($theme->info), 'theme', $theme->filename, isset($theme->status) ? $theme->status : 0);
   }
 
   return $themes;
diff --git a/modules/system/system.test b/modules/system/system.test
index 756b6c196..a88cef457 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -133,7 +133,7 @@ class EnableDisableCoreTestCase extends DrupalWebTestCase {
    * @param boolean $enabled Module state.
    */
   function assertModules(Array $modules, $enabled) {
-    module_list(TRUE, FALSE);
+    module_list(TRUE);
     foreach ($modules as $module) {
       if ($enabled) {
         $message = 'Module "@module" is enabled.';