diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
index 4e45e48..6774119 100644
--- a/core/modules/block/block.admin.inc
+++ b/core/modules/block/block.admin.inc
@@ -6,7 +6,6 @@
  */
 
 use Drupal\block\Plugin\Core\Entity\Block;
-use Drupal\Core\Template\Attribute;
 
 /**
  * Page callback: Attaches CSS for the block region demo.
@@ -85,19 +84,15 @@ function block_admin_edit(Block $entity) {
 }
 
 /**
- * Prepares variables for block admin display form templates.
+ * Processes variables for block-admin-display-form.tpl.php.
  *
- * Default template: block-admin-display-form.html.twig.
+ * The $variables array contains the following arguments:
+ * - $form
  *
- * @param array $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
+ * @see block-admin-display.tpl.php
+ * @see theme_block_admin_display()
  */
 function template_preprocess_block_admin_display_form(&$variables) {
-  $header = array(t('Block'), t('Region'), t('Weight'), t('Operations'));
-  // @todo Remove/refactor pending http://drupal.org/node/1920886.
-  $children = $variables['form'];
-
   $variables['block_regions'] = $variables['form']['block_regions']['#value'];
   if (isset($variables['block_regions'][BLOCK_REGION_NONE])) {
     $variables['block_regions'][BLOCK_REGION_NONE] = t('Disabled');
@@ -105,11 +100,11 @@ function template_preprocess_block_admin_display_form(&$variables) {
 
   foreach ($variables['block_regions'] as $key => $value) {
     // Initialize an empty array for the region.
-    $block_listing[$key] = array();
+    $variables['block_listing'][$key] = array();
   }
 
   // Initialize disabled blocks array.
-  $block_listing[BLOCK_REGION_NONE] = array();
+  $variables['block_listing'][BLOCK_REGION_NONE] = array();
 
   // Add each block in the form to the appropriate place in the block listing.
   foreach (element_children($variables['form']['blocks']) as $i) {
@@ -122,61 +117,15 @@ function template_preprocess_block_admin_display_form(&$variables) {
     $block['region']['#attributes']['class'] = array('block-region-select', 'block-region-' . $region);
     $block['weight']['#attributes']['class'] = array('block-weight', 'block-weight-' . $region);
 
-    $block_listing[$region][$i] = new stdClass();
-    $block_listing[$region][$i]->row_class = !empty($block['#attributes']['class']) ? implode(' ', $block['#attributes']['class']) : '';
-    $block_listing[$region][$i]->block_modified = !empty($block['#attributes']['class']) && in_array('block-modified', $block['#attributes']['class']);
-    $block_listing[$region][$i]->block_title = $block['info'];
-    $block_listing[$region][$i]->region_select = array(
-      'region' => array(
-        'data' => $block['region'],
-        '#weight' => 1,
-      ),
-      'theme' => array(
-        'data' => $block['theme'],
-        '#weight' => 2,
-      ),
-    );
-    $block_listing[$region][$i]->weight_select = $block['weight'];
-    $block_listing[$region][$i]->operations = $block['operations'];
-    $block_listing[$region][$i]->printed = FALSE;
+    $variables['block_listing'][$region][$i] = new stdClass();
+    $variables['block_listing'][$region][$i]->row_class = !empty($block['#attributes']['class']) ? implode(' ', $block['#attributes']['class']) : '';
+    $variables['block_listing'][$region][$i]->block_modified = !empty($block['#attributes']['class']) && in_array('block-modified', $block['#attributes']['class']);
+    $variables['block_listing'][$region][$i]->block_title = drupal_render($block['info']);
+    $variables['block_listing'][$region][$i]->region_select = drupal_render($block['region']) . drupal_render($block['theme']);
+    $variables['block_listing'][$region][$i]->weight_select = drupal_render($block['weight']);
+    $variables['block_listing'][$region][$i]->operations = drupal_render($block['operations']);
+    $variables['block_listing'][$region][$i]->printed = FALSE;
   }
 
-  $rows = array();
-  foreach ($block_listing as $region => $block_list) {
-    $rows[] = array(
-      'data' => array(
-        array('data' => t($variables['block_regions'][$region]), 'colspan' => 4),
-      ),
-      'class' => array('region-title region-title-' . $region)
-    );
-    $rows[] = array(
-      'data' => array(
-        array('data' => '<em>'. t('No blocks in this region ') . '</em>', 'colspan' => 4),
-      ),
-      'class' => array('region-message', 'region-' . $region . '-message', empty($block_listing[$region]) ? 'region-empty' : 'region-populated')
-    );
-    foreach ($block_list as $key => $block) {
-      $rows[] = array(
-        'data' => array(
-          array('data' => $block->block_title),
-          array('data' => $block->region_select),
-          array('data' => $block->weight_select),
-          array('data' => $block->operations),
-        ),
-        'class' => array('draggable'),
-      );
-    }
-  }
-  $attributes = new Attribute(array('id' => 'blocks', 'class' => array()));
-  drupal_add_tabledrag('blocks', 'order', 'sibling', 'block-weight');
-  $variables['table'] = array(
-    '#theme' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
-    '#attributes' => $attributes,
-  );
-  // Remove elements from the 'children' render array.
-  // @todo Refactor when http://drupal.org/node/1920886 is resolved.
-  unset($children['blocks'], $children['block_regions']);
-  $variables['children'] = drupal_render_children($children);
+  $variables['form_submit'] = drupal_render_children($variables['form']);
 }
diff --git a/core/modules/block/templates/block-admin-display-form.html.twig b/core/modules/block/templates/block-admin-display-form.html.twig
deleted file mode 100644
index 0a9fbc9..0000000
--- a/core/modules/block/templates/block-admin-display-form.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to configure blocks.
- *
- * Available variables:
- * - table: Draggable table containing blocks.
- * - children: Child elements of the form that still need to be printed.
- *
- * @see template_preprocess()
- * @see template_preprocess_block_admin_display_form()
- *
- * @ingroup themeable
- */
-#}
-{{ table }}
-{{ children }}
diff --git a/core/modules/block/templates/block-admin-display-form.tpl.php b/core/modules/block/templates/block-admin-display-form.tpl.php
new file mode 100644
index 0000000..4fa3e70
--- /dev/null
+++ b/core/modules/block/templates/block-admin-display-form.tpl.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Default theme implementation to configure blocks.
+ *
+ * Available variables:
+ * - $block_regions: An array of regions. Keyed by name with the title as value.
+ * - $block_listing: An array of blocks keyed by region and then delta.
+ * - $form_submit: Form submit button.
+ *
+ * Each $block_listing[$region] contains an array of blocks for that region.
+ *
+ * Each $data in $block_listing[$region] contains:
+ * - $data->region_title: Region title for the listed block.
+ * - $data->block_title: Block title.
+ * - $data->region_select: Drop-down menu for assigning a region.
+ * - $data->weight_select: Drop-down menu for setting weights.
+ * - $data->operations: Block operations.
+ *
+ * @see template_preprocess_block_admin_display_form()
+ * @see theme_block_admin_display()
+ *
+ * @ingroup themeable
+ */
+?>
+<table id="blocks" class="sticky-enabled">
+  <thead>
+    <tr>
+      <th><?php print t('Block'); ?></th>
+      <th><?php print t('Region'); ?></th>
+      <th><?php print t('Weight'); ?></th>
+      <th><?php print t('Operations'); ?></th>
+    </tr>
+  </thead>
+  <tbody>
+    <?php $row = 0; ?>
+    <?php foreach ($block_regions as $region => $title): ?>
+      <tr class="region-title region-title-<?php print $region?>">
+        <td colspan="5"><?php print $title; ?></td>
+      </tr>
+      <tr class="region-message region-<?php print $region?>-message <?php print empty($block_listing[$region]) ? 'region-empty' : 'region-populated'; ?>">
+        <td colspan="5"><em><?php print t('No blocks in this region'); ?></em></td>
+      </tr>
+      <?php foreach ($block_listing[$region] as $delta => $data): ?>
+      <tr class="draggable <?php print $row % 2 == 0 ? 'odd' : 'even'; ?><?php print $data->row_class ? ' ' . $data->row_class : ''; ?>">
+        <td class="block"><?php print $data->block_title; ?></td>
+        <td><?php print $data->region_select; ?></td>
+        <td><?php print $data->weight_select; ?></td>
+        <td><?php print $data->operations; ?></td>
+      </tr>
+      <?php $row++; ?>
+      <?php endforeach; ?>
+    <?php endforeach; ?>
+  </tbody>
+</table>
+
+<?php print $form_submit; ?>