diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 97f59e9..4c084a7 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -987,6 +987,7 @@ function block_rebuild() {
 function template_preprocess_block(&$variables) {
   $block_counter = &drupal_static(__FUNCTION__, array());
   $variables['block'] = $variables['elements']['#block'];
+  $variables['title'] = $variables['elements']['#block']->subject;
   // All blocks get an independent counter for each region.
   if (!isset($block_counter[$variables['block']->region])) {
     $block_counter[$variables['block']->region] = 1;
diff --git a/core/modules/block/block.tpl.php b/core/modules/block/block.tpl.php
index 78387a8..e20f2e2 100644
--- a/core/modules/block/block.tpl.php
+++ b/core/modules/block/block.tpl.php
@@ -47,8 +47,8 @@
 <div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
   <?php print render($title_prefix); ?>
-<?php if ($block->subject): ?>
-  <h2<?php print $title_attributes; ?>><?php print $block->subject ?></h2>
+<?php if ($title): ?>
+  <h2<?php print $title_attributes; ?>><?php print $title ?></h2>
 <?php endif;?>
   <?php print render($title_suffix); ?>