diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 0dea123..a585787 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -794,6 +794,9 @@ function drupal_get_filename($type, $name, $filename = NULL) {
         $dir = 'themes/engines';
         $extension = 'engine';
       }
+      elseif ($type == 'theme' || $type == 'module') {
+        $extension = 'info.yml';
+      }
       // Profiles are converted into modules in system_rebuild_module_data().
       // @todo Remove false-exposure of profiles as modules.
       elseif ($original_type == 'profile') {
@@ -801,7 +804,7 @@ function drupal_get_filename($type, $name, $filename = NULL) {
         $extension = 'info.yml';
       }
       else {
-        $extension = 'info.yml';
+        $extension = $type;
       }
 
       if (!isset($dirs[$dir][$extension])) {