diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
index ccc99d2..e9040b9 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
@@ -53,13 +53,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = parent::settingsSummary();
     if ($this->getSetting('native_language')) {
-      $additional_summary = $this->t('Displayed in native language');
-      if (!empty($summary)) {
-        $summary[] .= '; ' . $additional_summary;
-      }
-      else {
-        $summary[] = $additional_summary;
-      }
+      $summary[] = $this->t('Displayed in native language');
     }
     return $summary;
   }
diff --git a/core/modules/node/src/Tests/Views/NodeLanguageTest.php b/core/modules/node/src/Tests/Views/NodeLanguageTest.php
index 47e4391..789c167 100644
--- a/core/modules/node/src/Tests/Views/NodeLanguageTest.php
+++ b/core/modules/node/src/Tests/Views/NodeLanguageTest.php
@@ -242,6 +242,7 @@ public function testNativeLanguageField() {
     $this->assertLanguageNames(TRUE);
 
     // Modify test view to use the views built-in language field and test that.
+    \Drupal::state()->set('node_test_views.use_basic_handler', TRUE);
     $config = $this->config('views.view.test_language');
     $config->set('display.default.display_options.fields.langcode.native_language', FALSE);
     $config->clear('display.default.display_options.fields.langcode.settings');
diff --git a/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc b/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc
index 37a2e81..c9f5d57 100644
--- a/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc
+++ b/core/modules/node/tests/modules/node_test_views/node_test_views.views.inc
@@ -9,7 +9,8 @@
  * Implements hook_views_data_alter().
  */
 function node_test_views_views_data_alter(array &$data) {
-  // Make node titles use configurable field rendering for this test.
-  // @todo No need for this once https://www.drupal.org/node/2342045 lands.
-  $data['node_field_data']['langcode']['field']['id'] = 'language';
+  // Make node language use the basic field handler if requested.
+  if (Drupal::state('node_test_views.use_basic_handler')) {
+    $data['node_field_data']['langcode']['field']['id'] = 'language';
+  }
 }