diff -u b/core/includes/module.inc b/core/includes/module.inc
--- b/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -83,14 +83,7 @@
     $list = $module_list;
   }
   elseif (!isset($module_list)) {
-    if ($type == 'bootstrap') {
-      $list = system_list('bootstrap');
-    }
-    else {
-      // Not using drupal_map_assoc() here as that requires common.inc.
-      $list = array_keys(system_list($type));
-      $list = (!empty($list) ? array_combine($list, $list) : array());
-    }
+    $list = system_list($type);
   }
   return $list;
 }
diff -u b/core/modules/system/system.module b/core/modules/system/system.module
--- b/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1,13 +1,11 @@
 <?php
 
-use Drupal\Core\Utility\CacheArray;
-use Drupal\Core\Utility\ModuleInfo;
-
 /**
  * @file
  * Configuration system that lets administrators modify the workings of the site.
  */
 
+use Drupal\Core\Utility\ModuleInfo;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -2444,28 +2437,6 @@
 }
 
 /**
  * Return .info data for modules.
  *
- * @param $property
+ * @param string $property
  *   The .info property to retrieve.
  *
- * @return
+ * @return array
  *   An array keyed by module name, with the .info file property as values.
  *   Only modules with the property specified in their .info file will be
  *   returned.
  *
  * @see Drupal\Core\Utility\ModuleInfo
  */
only in patch2:
unchanged:
--- a/core/modules/search/search.admin.inc
+++ b/core/modules/search/search.admin.inc
@@ -29,13 +29,9 @@ function search_reindex_confirm_submit(&$form, &$form_state) {
  * Helper function to get real module names.
  */
 function _search_get_module_names() {
-
   $search_info = search_get_info(TRUE);
-  $system_info = system_get_info('module');
-  $names = array();
-  foreach ($search_info as $module => $info) {
-    $names[$module] = $system_info[$module]['name'];
-  }
+  $names = system_get_module_info('name');
+  $names = array_intersect_key($names, $search_info);
   asort($names, SORT_STRING);
   return $names;
 }