diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
index 0cc00d6..ceecee2 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
@@ -75,6 +75,7 @@ protected function updateEntity(EntityInterface $entity, Row $row) {
     }
 
     $this->setRollbackAction($row->getIdMap());
+    return $entity;
   }
 
   /**
diff --git a/core/modules/migrate/tests/modules/migrate_external_translated_test/migration_templates/migrate.migration.external_translated_test_node.yml b/core/modules/migrate/tests/modules/migrate_external_translated_test/migration_templates/migrate.migration.external_translated_test_node.yml
deleted file mode 100644
index 8095841..0000000
--- a/core/modules/migrate/tests/modules/migrate_external_translated_test/migration_templates/migrate.migration.external_translated_test_node.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-id: external_translated_test_node
-label: External translated content
-source:
-  plugin: migrate_external_translated_test
-  default_lang: true
-  constants:
-    type: external_test
-process:
-  type: constants/type
-  title: title
-  langcode:
-  langcode:
-    plugin: static_map
-    source: lang
-    map:
-      English: en
-      French: fr
-      Spanish: es
-destination:
-  plugin: entity:node
diff --git a/core/modules/migrate/tests/modules/migrate_external_translated_test/migration_templates/migrate.migration.external_translated_test_node_translation.yml b/core/modules/migrate/tests/modules/migrate_external_translated_test/migration_templates/migrate.migration.external_translated_test_node_translation.yml
deleted file mode 100644
index ff29084..0000000
--- a/core/modules/migrate/tests/modules/migrate_external_translated_test/migration_templates/migrate.migration.external_translated_test_node_translation.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-id: external_translated_test_node_translation
-label: External translated content translations
-source:
-  plugin: migrate_external_translated_test
-  default_lang: false
-  constants:
-    type: external_test
-process:
-  nid:
-    plugin: migration
-    source: name
-    migration: external_translated_test_node
-  type: constants/type
-  title: title
-  langcode:
-    plugin: static_map
-    source: lang
-    map:
-      English: en
-      French: fr
-      Spanish: es
-destination:
-  plugin: entity:node
-  translations: true
-migration_dependencies:
-  required:
-    - external_translated_test_node
diff --git a/core/modules/migrate/tests/modules/migrate_external_translated_test/migrations/migrate.migration.external_translated_test_node.yml b/core/modules/migrate/tests/modules/migrate_external_translated_test/migrations/migrate.migration.external_translated_test_node.yml
new file mode 100644
index 0000000..f643b60
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_external_translated_test/migrations/migrate.migration.external_translated_test_node.yml
@@ -0,0 +1,19 @@
+id: external_translated_test_node
+label: External translated content
+source:
+  plugin: migrate_external_translated_test
+  default_lang: true
+  constants:
+    type: external_test
+process:
+  type: constants/type
+  title: title
+  langcode:
+    plugin: static_map
+    source: lang
+    map:
+      English: en
+      French: fr
+      Spanish: es
+destination:
+  plugin: entity:node
diff --git a/core/modules/migrate/tests/modules/migrate_external_translated_test/migrations/migrate.migration.external_translated_test_node_translation.yml b/core/modules/migrate/tests/modules/migrate_external_translated_test/migrations/migrate.migration.external_translated_test_node_translation.yml
new file mode 100644
index 0000000..ff29084
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_external_translated_test/migrations/migrate.migration.external_translated_test_node_translation.yml
@@ -0,0 +1,27 @@
+id: external_translated_test_node_translation
+label: External translated content translations
+source:
+  plugin: migrate_external_translated_test
+  default_lang: false
+  constants:
+    type: external_test
+process:
+  nid:
+    plugin: migration
+    source: name
+    migration: external_translated_test_node
+  type: constants/type
+  title: title
+  langcode:
+    plugin: static_map
+    source: lang
+    map:
+      English: en
+      French: fr
+      Spanish: es
+destination:
+  plugin: entity:node
+  translations: true
+migration_dependencies:
+  required:
+    - external_translated_test_node
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php b/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
index eb3692e..3eaa8ff 100644
--- a/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
@@ -19,7 +19,8 @@ class MigrateExternalTranslatedTest extends MigrateTestBase {
   /**
    * {@inheritdoc}
    *
-   * We only need migrate_drupal because of https://www.drupal.org/node/2560795 .
+   * @todo: Remove migrate_drupal when https://www.drupal.org/node/2560795 is
+   * fixed.
    */
   public static $modules = ['system', 'user', 'language', 'node', 'field', 'migrate_drupal', 'migrate_external_translated_test'];
 
@@ -63,21 +64,18 @@ public function testMigrations() {
     $this->assertEquals('Cat', $node->title->value);
     $this->assertEquals('Chat', $node->getTranslation('fr')->title->value);
     $this->assertEquals('Gato', $node->getTranslation('es')->title->value);
-    $this->assertFalse($node->hasTranslation('de'));
 
     $node = $storage->load(2);
     $this->assertEquals('en', $node->language()->getId());
     $this->assertEquals('Dog', $node->title->value);
     $this->assertEquals('Chien', $node->getTranslation('fr')->title->value);
     $this->assertFalse($node->hasTranslation('es'));
-    $this->assertFalse($node->hasTranslation('de'));
 
     $node = $storage->load(3);
     $this->assertEquals('en', $node->language()->getId());
     $this->assertEquals('Monkey', $node->title->value);
     $this->assertFalse($node->hasTranslation('fr'));
     $this->assertFalse($node->hasTranslation('es'));
-    $this->assertFalse($node->hasTranslation('de'));
 
     $this->assertNull($storage->load(4));