diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
index b438c1f..82b614b 100644
--- a/core/modules/block/block.admin.inc
+++ b/core/modules/block/block.admin.inc
@@ -194,7 +194,7 @@ function template_preprocess_block_admin_display_form(&$variables) {
       );
     }
   }
-  $attributes = new Attribute(array('id' => 'blocks'));
+  $attributes = new Attribute(array('id' => 'blocks', 'class' => array()));
   drupal_add_tabledrag('blocks', 'order', 'sibling', 'block-weight');
   $variables['table'] = array(
     '#theme' => 'table',
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 0061e12..4b56018 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -536,12 +536,15 @@ function template_preprocess_block(&$variables) {
   $block_counter = &drupal_static(__FUNCTION__, array());
 
   $variables['block'] = (object) $variables['elements']['#block_config'];
+  if (!isset($variables['block']->label)) {
+    $variables['block']->label = $variables['elements']['#block']->label;
+  }
   // If the block title is configured to be hidden, set it to an empty string.
   if (empty($variables['elements']['#block']->label_display)) {
     $variables['block']->label_hidden = $variables['block']->label;
     $variables['block']->label = '';
   }
-  $variables['label'] = check_plain($variables['elements']['#block']->label);
+  $variables['label'] = check_plain($variables['block']->label);
 
   // All blocks get an independent counter for each region.
   if (!isset($block_counter[$variables['block']->region])) {