diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 9de0ff2..e122f94 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -1147,16 +1147,18 @@ function views_get_all_views() {
  * Returns an array of all enabled views, as fully loaded $view objects.
  */
 function views_get_enabled_views() {
-  $views = views_get_all_views();
-  return array_filter($views, 'views_view_is_enabled');
+  return drupal_container()->get('entity.query')->get('view')
+    ->condition('disabled', FALSE)
+    ->execute();
 }
 
 /**
  * Returns an array of all disabled views, as fully loaded $view objects.
  */
 function views_get_disabled_views() {
-  $views = views_get_all_views();
-  return array_filter($views, 'views_view_is_disabled');
+  return drupal_container()->get('entity.query')->get('view')
+    ->condition('disabled', TRUE)
+    ->execute();
 }
 
 /**