diff -u b/core/modules/block/lib/Drupal/block/BlockRenderController.php b/core/modules/block/lib/Drupal/block/BlockRenderController.php
--- b/core/modules/block/lib/Drupal/block/BlockRenderController.php
+++ b/core/modules/block/lib/Drupal/block/BlockRenderController.php
@@ -37,7 +37,8 @@
     $build = array();
     foreach ($entities as $entity_id => $entity) {
       $build[$entity_id] = $entity->getPlugin()->build();
-      // @todo Remove after fixing moving access check logic to the plugin.
+
+      // @todo Remove after fixing http://drupal.org/node/1989568.
       $build[$entity_id]['#block'] = $entity;
     }
     return $build;
diff -u b/core/modules/block/templates/block.tpl.php b/core/modules/block/templates/block.tpl.php
--- b/core/modules/block/templates/block.tpl.php
+++ b/core/modules/block/templates/block.tpl.php
@@ -5,13 +5,9 @@
  * Default theme implementation to display a block.
  *
  * Available variables:
- * - $block->label: Block title.
- * - $block->label_hidden: The hidden block title value if the block was
- *    configured to hide the title ($block->label is empty in this case).
+ * - $plugin_id: The ID of the block implementation.
+ * - $configuration: An array of the block's configuration values.
  * - $content: Block content.
- * - $block->module: Module that generated the block.
- * - $block->delta: An ID for the block, unique within each module.
- * - $block->region: The block region embedding the current block.
  * - $attributes: An instance of Attributes class that can be manipulated as an
  *    array and printed as a string.
  *    It includes the 'class' information, which includes: