diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/comment/config/views.view.comments_recent.yml
similarity index 100%
rename from core/modules/views/config/views.view.comments_recent.yml
rename to core/modules/comment/config/views.view.comments_recent.yml
diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/node/config/views.view.archive.yml
similarity index 100%
rename from core/modules/views/config/views.view.archive.yml
rename to core/modules/node/config/views.view.archive.yml
diff --git a/core/modules/views/config/views.view.frontpage.yml b/core/modules/node/config/views.view.frontpage.yml
similarity index 100%
rename from core/modules/views/config/views.view.frontpage.yml
rename to core/modules/node/config/views.view.frontpage.yml
diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/node/config/views.view.glossary.yml
similarity index 100%
rename from core/modules/views/config/views.view.glossary.yml
rename to core/modules/node/config/views.view.glossary.yml
diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/node/config/views.view.tracker.yml
similarity index 100%
rename from core/modules/views/config/views.view.tracker.yml
rename to core/modules/node/config/views.view.tracker.yml
diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/search/config/views.view.backlinks.yml
similarity index 100%
rename from core/modules/views/config/views.view.backlinks.yml
rename to core/modules/search/config/views.view.backlinks.yml
diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/taxonomy/config
similarity index 100%
rename from core/modules/views/config/views.view.taxonomy_term.yml
rename to core/modules/taxonomy/config
diff --git a/core/modules/views/lib/Drupal/views/ViewStorageController.php b/core/modules/views/lib/Drupal/views/ViewStorageController.php
index 05268d2..fbdfac3 100644
--- a/core/modules/views/lib/Drupal/views/ViewStorageController.php
+++ b/core/modules/views/lib/Drupal/views/ViewStorageController.php
@@ -16,21 +16,6 @@
 class ViewStorageController extends ConfigStorageController {
 
   /**
-   * Overrides Drupal\config\ConfigStorageController::load();
-   */
-  public function load(array $ids = NULL) {
-    $entities = parent::load($ids);
-
-    // Only return views for enabled modules.
-    return array_filter($entities, function ($entity) {
-      if (module_exists($entity->get('module'))) {
-        return TRUE;
-      }
-      return FALSE;
-    });
-  }
-
-  /**
    * Overrides Drupal\config\ConfigStorageController::attachLoad();
    */
   protected function attachLoad(&$queried_entities, $revision_id = FALSE) {