diff --git a/core/modules/page/lib/Drupal/page/PageListController.php b/core/modules/page/lib/Drupal/page/PageListController.php
index 16d2600..c3e14d9 100644
--- a/core/modules/page/lib/Drupal/page/PageListController.php
+++ b/core/modules/page/lib/Drupal/page/PageListController.php
@@ -7,30 +7,14 @@
 
 namespace Drupal\page;
 
-use Drupal\Core\Entity\EntityListController;
+use Drupal\Core\Config\Entity\ConfigEntityListController;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 
 /**
  * Provides a listing of pages.
  */
-class PageListController extends EntityListController {
-
-  /**
-   * Overrides Drupal\Core\Entity\EntityListController::__constuct();
-   */
-  public function __construct($entity_type, EntityStorageControllerInterface $storage) {
-    parent::__construct($entity_type, $storage);
-  }
-
-  /**
-   * Overrides Drupal\Core\Entity\EntityListController::load().
-   */
-  public function load() {
-    $items = $this->storage->load();
-    uasort($items, 'page_sort_weight');
-    return $items;
-  }
+class PageListController extends ConfigEntityListController {
 
   /**
    * Get form for listing page to display for weights.
diff --git a/core/modules/page/page.module b/core/modules/page/page.module
index 9186058..695e493 100644
--- a/core/modules/page/page.module
+++ b/core/modules/page/page.module
@@ -174,15 +174,3 @@ function page_theme($existing, $type, $theme, $path) {
     ),
   );
 }
-
-/**
- * Helper to sort objects by weight.
- */
-function page_sort_weight($a, $b) {
-  $a_weight = (is_object($a) && isset($a->weight)) ? $a->weight : 0;
-  $b_weight = (is_object($b) && isset($b->weight)) ? $b->weight : 0;
-  if ($a_weight == $b_weight) {
-    return 0;
-  }
-  return ($a_weight < $b_weight) ? -1 : 1;
-}