diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
index be0524b..3ddcdf1 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
@@ -339,6 +339,7 @@ public function save(EntityInterface $entity) {
         $return = drupal_write_record($this->entityInfo['base_table'], $record);
         $entity->{$this->idKey}->value = $record->{$this->idKey};
         if ($this->revisionKey) {
+          $entity->setNewRevision();
           $record->{$this->revisionKey} = $this->saveRevision($entity);
         }
         $entity->{$this->idKey}->value = $record->{$this->idKey};
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php
index 80384ae..baf72ba 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php
@@ -33,6 +33,7 @@ function setUp() {
     parent::setUp();
     $this->installSchema('system', 'url_alias');
     $this->installSchema('node', 'node');
+    $this->installSchema('node', 'node_revision');
     $this->installSchema('node', 'node_access');
     $this->installSchema('node', 'node_field_data');
     $this->installSchema('node', 'node_field_revision');
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 6a86317..1a34b0f 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -2142,7 +2142,7 @@ function node_file_download_access($field, EntityInterface $entity, File $file)
  */
 function node_language_delete($language) {
   // On nodes with this language, unset the language.
-  db_update('node')
+  db_update('node_revision')
     ->fields(array('langcode' => ''))
     ->condition('langcode', $language->id)
     ->execute();
diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module
index f1d7075..d2cb2c2 100644
--- a/core/modules/translation/translation.module
+++ b/core/modules/translation/translation.module
@@ -503,7 +503,7 @@ function translation_node_get_translations($tnid) {
     if (!isset($translations[$tnid])) {
       $translations[$tnid] = array();
       $query = db_select('node_field_data', 'n');
-      $query->innerJoin('node', 'nb', 'nb.nid = n.nid AND nb.langcode = n.langcode');
+      $query->innerJoin('node', 'nb', 'nb.nid = n.nid');
       $query->fields('n', array('nid', 'uid', 'status', 'title', 'langcode'))
         ->fields('nb', array('type'))
         ->condition('nb.tnid', $tnid)