diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 1668d73..ae8ff88 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1090,7 +1090,6 @@ function drupal_page_is_cacheable($allow_caching = NULL) {
  */
 function bootstrap_invoke_all($hook) {
   foreach (module_list('bootstrap') as $module) {
-    drupal_load('module', $module);
     module_invoke($module, $hook);
   }
 }
diff --git a/core/includes/module.inc b/core/includes/module.inc
index 41103b2..701f855 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -150,7 +150,7 @@ function system_list($type) {
       // drupal_get_filename() static cache for bootstrap modules only.
       // The rest is stored separately to keep the bootstrap module cache small.
       foreach ($lists['bootstrap'] as $module => $filename) {
-        _system_list_warm('module', $module, $filename);
+        _system_list_warm('module', $module, $filename, TRUE);
       }
     }
     else {
@@ -167,6 +167,7 @@ function system_list($type) {
     }
     else {
       $lists = _system_list_rebuild();
+      $lists['bootstrap'] = array_keys($lists['bootstrap']);
     }
     foreach ($lists['filepaths'] as $item) {
       _system_list_warm($item['type'], $item['name'], $item['filepath']);
@@ -250,7 +251,7 @@ function _system_list_rebuild() {
     _system_list_warm('module', $name, $filename, TRUE);
     foreach (bootstrap_hooks() as $hook) {
       if (function_exists($name .'_' . $hook)) {
-        $lists['bootstrap'][] = $filename;
+        $lists['bootstrap'][$name] = $filename;
       }
     }
   }