diff --git a/core/lib/Drupal/Core/Field/FormatterPluginManager.php b/core/lib/Drupal/Core/Field/FormatterPluginManager.php
index d100add..f0a1c0d 100644
--- a/core/lib/Drupal/Core/Field/FormatterPluginManager.php
+++ b/core/lib/Drupal/Core/Field/FormatterPluginManager.php
@@ -61,9 +61,6 @@ public function createInstance($plugin_id, array $configuration = array()) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
 
-    // @todo Not sure we need to keep that, there should always be a settings_langcode set ?
-    $configuration += ['settings_langcode' => NULL];
-
     // @todo This is copied from \Drupal\Core\Plugin\Factory\ContainerFactory.
     //   Find a way to restore sanity to
     //   \Drupal\Core\Field\FormatterBase::__construct().
@@ -134,6 +131,7 @@ public function getInstance(array $options) {
     $configuration += array(
       'field_definition' => $field_definition,
       'view_mode' => $options['view_mode'],
+      'settings_langcode' => NULL,
     );
     return $this->createInstance($plugin_id, $configuration);
   }