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
@@ -852,13 +852,8 @@
  * @see \Drupal\Core\Extension\ThemeHandlerInterface::rebuildThemeData()
  */
 function system_get_info($type, $name = NULL) {
-  $info = array();
   if ($type == 'module') {
-    static $drupal_static_fast;
-    if (!isset($drupal_static_fast)) {
-      $drupal_static_fast = &drupal_static(__FUNCTION__);
-    }
-    $info = &$drupal_static_fast;
+    $info = &drupal_static(__FUNCTION__);
     if (!isset($info)) {
       if ($cache = \Drupal::cache()->get('system.module.info')) {
         $info = $cache->data;
@@ -879,6 +874,7 @@
     }
   }
   else {
+    $info = array();
     $list = system_list($type);
     foreach ($list as $shortname => $item) {
       if (!empty($item->status)) {