commit 48290c16ce793e02493b74d0334b65a033e19c81
Author: Tim Plunkett <git@plnktt.com>
Date:   Thu Sep 24 11:32:14 2015 +0200

    asdf

diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
index c2d2dd8..f9e349e 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
@@ -51,18 +51,9 @@ protected function addContextAssignmentElement(ContextAwarePluginInterface $plug
           '#type' => 'value',
           '#value' => $context_id,
         ];
-        $element['context_slot_title'] = [
-          '#type' => 'item',
-          '#title' => $definition->getLabel() ?: $context_slot,
-          '#markup' => $options[$context_id],
-        ];
       }
 
       if (count($options) > 1) {
-        // The context display element is only useful when a single context is
-        // available, we have multiple and require user interaction.
-        unset($element['context_slot_title']);
-
         $assignments = $plugin->getContextMapping();
         $element[$context_slot] = [
           '#title' => $definition->getLabel() ?: $this->t('Select a @context value:', ['@context' => $context_slot]),
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index a5154d5..51a39d7 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -64,10 +64,6 @@ public function getContextMapping() {
    * {@inheritdoc}
    */
   public function setContextMapping(array $context_mapping) {
-    // The ContextAwarePluginAssignmentTrait adds a visual element to the
-    // context mapping when only one context is available. We should unset this
-    // before saving the context mapping.
-    unset($context_mapping['context_slot_title']);
     if ($this instanceof ConfigurablePluginInterface) {
       $configuration = $this->getConfiguration();
       $configuration['context_mapping'] = $context_mapping;