diff --git a/core/lib/Drupal/Core/Condition/ConditionPluginBag.php b/core/lib/Drupal/Core/Condition/ConditionPluginBag.php
index 394bebf..3f4dc2d 100644
--- a/core/lib/Drupal/Core/Condition/ConditionPluginBag.php
+++ b/core/lib/Drupal/Core/Condition/ConditionPluginBag.php
@@ -32,23 +32,6 @@ public function &get($instance_id) {
   }
 
   /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    $configuration = parent::getConfiguration();
-    // Remove configuration if it matches the defaults.
-    foreach ($configuration as $instance_id => $instance_config) {
-      $default_config = array();
-      $default_config['id'] = $instance_id;
-      $default_config += $this->get($instance_id)->defaultConfiguration();
-      if ($default_config === $instance_config) {
-        unset($configuration[$instance_id]);
-      }
-    }
-    return $configuration;
-  }
-
-  /**
    * Sets the condition context for a given name.
    *
    * @param string $name
diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php b/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
index 9287d7c..5f07cb4 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
@@ -106,7 +106,7 @@ public function sortHelper($aID, $bID) {
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    $instances = array();
+    $configuration = array();
     $this->rewind();
     // Store the current order of the instances.
     $current_order = $this->instanceIDs;
@@ -116,15 +116,24 @@ public function getConfiguration() {
 
     foreach ($this as $instance_id => $instance) {
       if ($instance instanceof ConfigurablePluginInterface) {
-        $instances[$instance_id] = $instance->getConfiguration();
+        $default_config = array();
+        $default_config['id'] = $instance_id;
+        $default_config += $instance->defaultConfiguration();
+
+        $instance_config = $instance->getConfiguration();
+        // Only store the configuration if it doesn't matches the defaults.
+        if ($default_config !== $instance_config) {
+          $configuration[$instance_id] = $instance_config;
+        }
       }
       else {
-        $instances[$instance_id] = $this->configurations[$instance_id];
+        $configuration[$instance_id] = $this->configurations[$instance_id];
       }
     }
     // Restore the current order.
     $this->instanceIDs = $current_order;
-    return $instances;
+
+    return $configuration;
   }
 
   /**