diff --git a/core/modules/media/src/Entity/Media.php b/core/modules/media/src/Entity/Media.php
index 6a45bff..cbe19a8 100644
--- a/core/modules/media/src/Entity/Media.php
+++ b/core/modules/media/src/Entity/Media.php
@@ -14,6 +14,9 @@
 /**
  * Defines the media entity class.
  *
+ * @todo Remove "default" form handler when https://www.drupal.org/node/2006348
+ * lands.
+ *
  * @ContentEntityType(
  *   id = "media",
  *   label = @Translation("Media"),
diff --git a/core/modules/media/src/MediaHandlerBase.php b/core/modules/media/src/MediaHandlerBase.php
index 7a25b0b..d43afaf 100644
--- a/core/modules/media/src/MediaHandlerBase.php
+++ b/core/modules/media/src/MediaHandlerBase.php
@@ -189,7 +189,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
    * {@inheritdoc}
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    foreach($form_state->getValues() as $config_key => $config_value) {
+    foreach ($form_state->getValues() as $config_key => $config_value) {
       if (isset($this->configuration[$config_key])) {
         $this->configuration[$config_key] = $config_value;
       }