diff --git a/core/modules/block/src/BlockListBuilder.php b/core/modules/block/src/BlockListBuilder.php
index aa669fa..7949045 100644
--- a/core/modules/block/src/BlockListBuilder.php
+++ b/core/modules/block/src/BlockListBuilder.php
@@ -96,8 +96,7 @@ public function load() {
     $this->regions = system_region_list($this->theme, REGIONS_VISIBLE);
 
     // Load only blocks for this theme, and sort them.
-    // @todo Move the functionality of _block_rehash() out of the listing page.
-    $entities = _block_rehash($this->theme);
+    $entities = entity_load_multiple_by_properties('block', array('theme' => $this->theme));
 
     // Sort the blocks using \Drupal\block\Entity\Block::sort().
     uasort($entities, array($this->entityType->getClass(), 'sort'));