diff --git a/core/lib/Drupal/Core/Annotation/Action.php b/core/lib/Drupal/Core/Annotation/Action.php
index 129dc3b..b35f70d 100644
--- a/core/lib/Drupal/Core/Annotation/Action.php
+++ b/core/lib/Drupal/Core/Annotation/Action.php
@@ -60,7 +60,7 @@ class Action extends Plugin {
   public $type = '';
 
   /**
-   * The category under which the action will be listed in the UI.
+   * The category under which the action should be listed in the UI.
    *
    * @var \Drupal\Core\Annotation\Translation
    *
diff --git a/core/lib/Drupal/Core/Block/BlockManager.php b/core/lib/Drupal/Core/Block/BlockManager.php
index 48de798..ae73467 100644
--- a/core/lib/Drupal/Core/Block/BlockManager.php
+++ b/core/lib/Drupal/Core/Block/BlockManager.php
@@ -13,7 +13,6 @@
 use Drupal\Core\Plugin\CategorizingPluginManagerTrait;
 use Drupal\Core\Plugin\Context\ContextAwarePluginManagerTrait;
 use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Manages discovery and instantiation of block plugins.
@@ -26,17 +25,11 @@ class BlockManager extends DefaultPluginManager implements BlockManagerInterface
 
   use CategorizingPluginManagerTrait {
     getSortedDefinitions as traitGetSortedDefinitions;
+    getGroupedDefinitions as traitGetGroupedDefinitions;
   }
   use ContextAwarePluginManagerTrait;
 
   /**
-   * An array of all available modules and their data.
-   *
-   * @var array
-   */
-  protected $moduleData;
-
-  /**
    * Constructs a new \Drupal\Core\Block\BlockManager object.
    *
    * @param \Traversable $namespaces
@@ -76,6 +69,16 @@ public function getSortedDefinitions() {
   /**
    * {@inheritdoc}
    */
+  public function getGroupedDefinitions() {
+    $definitions = $this->traitGetGroupedDefinitions();
+    // Do not display the 'broken' plugin in the UI.
+    unset($definitions[$this->t('Block')]['broken']);
+    return $definitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function getFallbackPluginId($plugin_id, array $configuration = array()) {
     return 'broken';
   }
diff --git a/core/lib/Drupal/Core/Condition/Annotation/Condition.php b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
index acd0418..d796865 100644
--- a/core/lib/Drupal/Core/Condition/Annotation/Condition.php
+++ b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
@@ -60,7 +60,7 @@ class Condition extends Plugin {
   public $condition = array();
 
   /**
-   * The category under which the condition will be listed in the UI.
+   * The category under which the condition should listed in the UI.
    *
    * @var \Drupal\Core\Annotation\Translation
    *
diff --git a/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php b/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
index d4a833e..d3cf082 100644
--- a/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
+++ b/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
@@ -104,7 +104,7 @@ public function getSortedDefinitions($label_key = 'label') {
   public function getGroupedDefinitions() {
     $grouped_definitions = array();
     foreach ($this->getDefinitions() as $id => $definition) {
-      $grouped_definitions[$definition['category']][$id][$definition];
+      $grouped_definitions[$definition['category']][$id] = $definition;
     }
     return $grouped_definitions;
   }