diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index 3d39e4a1a4..e48b2e5a8b 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -264,6 +264,9 @@ protected function updateEntity(EntityInterface $entity, Row $row) {
         $language = $row->getDestinationProperty($property);
         if (!$entity->hasTranslation($language)) {
           $entity->addTranslation($language);
+          // MigrateUploadTest does an import where it is makes a new revision
+          // when the content type has new_revision as false.
+          // @todo: fix d6/MigrateUploadTest
           if ($this->storage->getEntityType()->isRevisionable() && $entity->isNewRevision()) {
             $entity->setNewRevision(TRUE);
           }
diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module
index 9cc5fcc5b0..5a3ca8aeef 100644
--- a/core/modules/migrate_drupal/migrate_drupal.module
+++ b/core/modules/migrate_drupal/migrate_drupal.module
@@ -310,10 +310,6 @@ function _use_master_node_migration(array $definitions) {
         $use_master_node = NODE_MIGRATE_TYPE_NOT_MASTER;
       }
     }
-
-    // Save the migration type in state.
-    $state = \Drupal::service('state');
-    $state->set('migrate_drupal.master', $use_master_node);
     return $use_master_node;
   }
 
diff --git a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
index b43add35df..92bc954fef 100644
--- a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
+++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
@@ -337,10 +337,6 @@ protected function useMasterNodeMigration($migrations, $version) {
         $use_master_node = NODE_MIGRATE_TYPE_NOT_MASTER;
       }
     }
-
-    // Save the migration type in state.
-    $state = $this->getState();
-    $state->set('migrate_drupal.master', $use_master_node);
     return $use_master_node;
   }