diff --git a/core/modules/display/lib/Drupal/display/DisplayFormController.php b/core/modules/display/lib/Drupal/display/DisplayFormController.php
index 78598bd..e2f7cbf 100644
--- a/core/modules/display/lib/Drupal/display/DisplayFormController.php
+++ b/core/modules/display/lib/Drupal/display/DisplayFormController.php
@@ -32,10 +32,10 @@ public function form(array $form, array &$form_state, EntityInterface $display)
     if (!isset($form_state['values'])) {
       $form_state['values'] = array();
     }
-    $regions = $display->get('blockInfo');
+    $regions = $display->getAllSortedBlocks();
     $form_state['values'] += array(
       'layout' => isset($display->layout) ? $display->layout : reset($layout_keys),
-      'regions' => empty($regions) ? array() : $regions,
+      'regions' => $regions,
     );
 
     $form['layout'] = array(
diff --git a/core/modules/layout/lib/Drupal/layout/Config/DisplayInterface.php b/core/modules/layout/lib/Drupal/layout/Config/DisplayInterface.php
index 871aadc..70a1785 100644
--- a/core/modules/layout/lib/Drupal/layout/Config/DisplayInterface.php
+++ b/core/modules/layout/lib/Drupal/layout/Config/DisplayInterface.php
@@ -50,7 +50,7 @@
    * @return array
    *   An array keyed on each block's configuration object name. Each value is
    *   an array of information that determines the placement of the block within
-   *   a layout, including:
+   *   a layout, including but not limited to:
    *   - region: The region in which to display the block (for bound displays
    *     only).
    *   - region-type: The type of region that is most appropriate for the block.
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
index d954832..0e99f12 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
+++ b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php
@@ -117,7 +117,7 @@ protected function sortBlocks() {
 
     foreach ($regions as $region_name => &$blocks) {
       uasort($blocks, 'drupal_sort_weight');
-      $this->blocksInRegions[$region_name] = array_keys($blocks);
+      $this->blocksInRegions[$region_name] = $blocks;
     }
   }