diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index a718808..73bf2f9 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -404,6 +404,34 @@ public function testContactConfigEntityTranslation() {
   }
 
   /**
+   * Tests the node type translation.
+   */
+  public function testNodeTypeTranslation() {
+    $type = Unicode::strtolower($this->randomMachineName(16));
+    $name = $this->randomString();
+    $this->drupalLogin($this->adminUser);
+    $this->drupalCreateContentType(array('type' => $type, 'name' => $name));
+
+    // Translate the node type name.
+    $langcode = $this->langcodes[0];
+    $translated_name = $langcode . '-' . $name;
+    $edit = array(
+      "translation[config_names][node.type.$type][name]" => $translated_name,
+    );
+    $this->drupalPostForm("admin/structure/types/manage/$type/translate/$langcode/add", $edit, t('Save translation'));
+
+    // Check the name is translated without admin theme for editing.
+    $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '0'), t('Save configuration'));
+    $this->drupalGet("$langcode/node/add/$type");
+    $this->assertRaw(t('Create @name', array('@name' => $translated_name)));
+
+    // Check the name is translated with admin theme for editing.
+    $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '1'), t('Save configuration'));
+    $this->drupalGet("$langcode/node/add/$type");
+    $this->assertRaw(t('Create @name', array('@name' => $translated_name)));
+  }
+
+  /**
    * Tests date format translation.
    */
   public function testDateFormatTranslation() {
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 182def1..ee970f2 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1339,10 +1339,3 @@ function node_comment_delete($comment) {
     node_reindex_node_search($comment->getCommentedEntityId());
   }
 }
-
-/**
- * Implements hook_config_translation_info_alter().
- */
-function node_config_translation_info_alter(&$info) {
-  $info['node_type']['class'] = 'Drupal\node\ConfigTranslation\NodeTypeMapper';
-}
diff --git a/core/modules/node/src/ConfigTranslation/NodeTypeMapper.php b/core/modules/node/src/ConfigTranslation/NodeTypeMapper.php
deleted file mode 100644
index be0cdb8..0000000
--- a/core/modules/node/src/ConfigTranslation/NodeTypeMapper.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\ConfigTranslation\NodeTypeMapper.
- */
-
-namespace Drupal\node\ConfigTranslation;
-
-use Drupal\config_translation\ConfigEntityMapper;
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides a configuration mapper for node types.
- */
-class NodeTypeMapper extends ConfigEntityMapper {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setEntity(ConfigEntityInterface $entity) {
-    parent::setEntity($entity);
-
-    // Adds the title label to the translation form.
-    $node_type = $entity->id();
-    $this->addConfigName("core.base_field_override.node.$node_type.title");
-  }
-
-}
diff --git a/core/modules/node/src/Tests/NodeTypeTranslationTest.php b/core/modules/node/src/Tests/NodeTypeTranslationTest.php
deleted file mode 100644
index 99c1558..0000000
--- a/core/modules/node/src/Tests/NodeTypeTranslationTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\NodeTypeTranslationTest.
- */
-
-namespace Drupal\node\Tests;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Ensures that node types translation work correctly.
- *
- * @group node
- */
-class NodeTypeTranslationTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array(
-    'config_translation',
-    'node',
-  );
-
-  /**
-   * Languages to enable.
-   *
-   * @var array
-   */
-  protected $langcodes = array('fr');
-
-  /**
-   * Administrator user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $admin_permissions = array(
-      'administer content types',
-      'administer site configuration',
-      'administer themes',
-      'translate configuration',
-    );
-
-    // Create and login user.
-    $this->adminUser = $this->drupalCreateUser($admin_permissions);
-
-    // Add languages.
-    foreach ($this->langcodes as $langcode) {
-      ConfigurableLanguage::createFromLangcode($langcode)->save();
-    }
-  }
-
-  /**
-   * Tests the node type translation.
-   */
-  public function testNodeTypeTranslation() {
-    $type = Unicode::strtolower($this->randomMachineName(16));
-    $name = $this->randomString();
-    $this->drupalLogin($this->adminUser);
-    $this->drupalCreateContentType(array('type' => $type, 'name' => $name));
-
-    // Translate the node type name.
-    $langcode = $this->langcodes[0];
-    $translated_name = $langcode . '-' . $name;
-    $edit = array(
-      "translation[config_names][node.type.$type][name]" => $translated_name,
-    );
-
-    // Edit the title label to avoid having an exception when we save the translation.
-    $this->drupalPostForm("admin/structure/types/manage/$type", array('title_label' => 'Edited title'), t('Save content type'));
-    $this->drupalPostForm("admin/structure/types/manage/$type/translate/$langcode/add", $edit, t('Save translation'));
-
-    // Check the name is translated without admin theme for editing.
-    $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '0'), t('Save configuration'));
-    $this->drupalGet("$langcode/node/add/$type");
-    $this->assertRaw(t('Create @name', array('@name' => $translated_name)));
-
-    // Check the name is translated with admin theme for editing.
-    $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '1'), t('Save configuration'));
-    $this->drupalGet("$langcode/node/add/$type");
-    $this->assertRaw(t('Create @name', array('@name' => $translated_name)));
-  }
-
-  /**
-   * Tests the node type title label translation.
-   */
-  public function testNodeTypeTitleLabelTranslation() {
-    $type = Unicode::strtolower($this->randomMachineName(16));
-    $name = $this->randomString();
-    $this->drupalLogin($this->adminUser);
-    $this->drupalCreateContentType(array('type' => $type, 'name' => $name));
-    $langcode = $this->langcodes[0];
-
-    // Edit the title label for it to be displayed on the translation form.
-    $this->drupalPostForm("admin/structure/types/manage/$type", array('title_label' => 'Edited title'), t('Save content type'));
-
-    // Assert that the title label is displayed on the translation form with the right value.
-    $this->drupalGet("admin/structure/types/manage/$type/translate/$langcode/add");
-    $this->assertRaw(t('Label'));
-    $this->assertRaw(t('Edited title'));
-
-    // Translate the title label.
-    $this->drupalPostForm(NULL, array("translation[config_names][core.base_field_override.node.$type.title][label]" => 'Translated title'), t('Save translation'));
-
-    // Assert that the right title label is displayed on the node add form.
-    $this->drupalGet("node/add/$type");
-    $this->assertRaw(t('Edited title'));
-    $this->drupalGet("$langcode/node/add/$type");
-    $this->assertRaw(t('Translated title'));
-  }
-
-}