diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index f96302b..1488654 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -37,17 +37,6 @@ public function buildComponents(array &$build, array $entities, array $displays,
           ]],
         ];
       }
-
-      // Add Language field text element to node render array.
-      if ($display->getComponent('langcode')) {
-        $build[$id]['langcode'] = [
-          '#type' => 'item',
-          '#title' => t('Language'),
-          '#markup' => $entity->language()->getName(),
-          '#prefix' => '<div id="field-language-display">',
-          '#suffix' => '</div>'
-        ];
-      }
     }
   }
 
diff --git a/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php b/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
index 9c442fd..33fe85f 100644
--- a/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
@@ -101,10 +101,7 @@ public function testLanguageFieldVisibility() {
 
     // Loads node page and check if Language field is hidden by default.
     $this->drupalGet('node/' . $node->id());
-    $language_field = $this->xpath('//div[@id=:id]/div', [
-      ':id' => 'field-language-display',
-    ]);
-    $this->assertTrue(empty($language_field), 'Language field value is not shown by default on node page.');
+    $this->assertNoText('English', 'Language field value is not shown by default on node page.');
 
     // Configures Language field formatter and check if it is saved.
     $edit = [
@@ -117,10 +114,17 @@ public function testLanguageFieldVisibility() {
 
     // Loads node page and check if Language field is shown.
     $this->drupalGet('node/' . $node->id());
-    $language_field = $this->xpath('//div[@id=:id]/div', [
-      ':id' => 'field-language-display',
-    ]);
-    $this->assertFalse(empty($language_field), 'Language field value is shown on node page.');
+    $this->assertText('English', 'Language field value is shown on node page.');
+    // Configure the Language field formatter to be displayed as a link.
+    $this->drupalGet('admin/structure/types/manage/article/display');
+    // Click on the formatter settings button to open the formatter settings
+    // form.
+    $this->drupalPostForm(NULL, [], "langcode_settings_edit");
+    $edit = ['fields[langcode][settings_edit_form][settings][link_to_entity]' => TRUE];
+    $this->drupalPostForm(NULL, $edit, "langcode_plugin_settings_update");
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->drupalGet('node/' . $node->id());
+    $this->assertLink('English', 0);
   }
 
 }