diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index db46ce9..bf7107a 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -130,7 +130,6 @@
  *     'promote'   => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
  *     'moderate'  => array('type' => 'int', 'not null' => TRUE,'default' => 0),
  *     'sticky'    => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
- *     'tnid'      => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
  *     'translate' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
  *   ),
  *   'indexes' => array(
@@ -142,7 +141,6 @@
  *     'node_title_type'     => array('title', array('type', 4)),
  *     'node_type'           => array(array('type', 4)),
  *     'uid'                 => array('uid'),
- *     'tnid'                => array('tnid'),
  *     'translate'           => array('translate'),
  *   ),
  *   'unique keys' => array(
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php b/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
index 6ab01af..84ee847 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
@@ -132,7 +132,7 @@ public function submitForm(array &$form, array &$form_state) {
       array(
         'content_translation_translatable_switch', array(
           !$translatable,
-          $this->field['entity_type'],
+          $this->fieldInfo->entity_type,
           $this->fieldName,
         ),
       ),
diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php
index 9071cac..3b404b8 100644
--- a/core/modules/node/lib/Drupal/node/Entity/Node.php
+++ b/core/modules/node/lib/Drupal/node/Entity/Node.php
@@ -401,11 +401,6 @@ public static function baseFieldDefinitions($entity_type) {
       'description' => t('A boolean indicating whether the node should be displayed at the top of lists in which it appears.'),
       'type' => 'boolean_field',
     );
-    $properties['tnid'] = array(
-      'label' => t('Translation set ID'),
-      'description' => t('The translation set id for this node, which equals the node id of the source post in each set.'),
-      'type' => 'integer_field',
-    );
     $properties['translate'] = array(
       'label' => t('Translate'),
       'description' => t('A boolean indicating whether this translation page needs to be updated.'),
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
index 12a6bbf..0834116 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
@@ -50,7 +50,6 @@ function testNodeTokenReplacement() {
     $tests = array();
     $tests['[node:nid]'] = $node->id();
     $tests['[node:vid]'] = $node->getRevisionId();
-    $tests['[node:tnid]'] = $node->tnid->value;
     $tests['[node:type]'] = 'article';
     $tests['[node:type-name]'] = 'Article';
     $tests['[node:title]'] = check_plain($node->getTitle());
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 2d2d1ec..c4dacda 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -50,15 +50,6 @@ function node_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-      // @todo Remove the following columns when removing the legacy Content
-      //   Translation module. See http://drupal.org/node/1952062.
-      'tnid' => array(
-        'description' => 'The translation set ID for this node, which equals the node ID of the source post in each set.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
       'translate' => array(
         'description' => 'A boolean indicating whether this translation page needs to be updated.',
         'type' => 'int',
@@ -68,7 +59,6 @@ function node_schema() {
     ),
     'indexes' => array(
       'node_type' => array(array('type', 4)),
-      'tnid' => array('tnid'),
       'translate' => array('translate'),
     ),
     'unique keys' => array(
diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc
index 298d44e..161df68 100644
--- a/core/modules/node/node.tokens.inc
+++ b/core/modules/node/node.tokens.inc
@@ -26,10 +26,6 @@ function node_token_info() {
     'name' => t("Revision ID"),
     'description' => t("The unique ID of the node's latest revision."),
   );
-  $node['tnid'] = array(
-    'name' => t("Translation set ID"),
-    'description' => t("The unique ID of the original-language version of this node, if one exists."),
-  );
   $node['type'] = array(
     'name' => t("Content type"),
     'description' => t("The type of the node."),
@@ -118,10 +114,6 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
           $replacements[$original] = $node->getRevisionId();
           break;
 
-        case 'tnid':
-          $replacements[$original] = $node->tnid->value;
-          break;
-
         case 'type':
           $replacements[$original] = $sanitize ? check_plain($node->getType()) : $node->getType();
           break;