diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php
index 7066970..42d3723 100644
--- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php
+++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php
@@ -80,8 +80,6 @@ public static function create(ContainerInterface $container, array $configuratio
   public function import(Row $row, array $old_destination_id_values = array()) {
     if (($stub = !$row->getSourceProperty('entity_type')) && ($state = $this->state->get('comment.maintain_entity_statistics', 0))) {
       $this->state->set('comment.maintain_entity_statistics', 0);
-      // Set default bundle.
-      $row->setDestinationProperty('comment_type', 'comment');
     }
     $return = parent::import($row, $old_destination_id_values);
     if ($stub && $state) {
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
index b183580..c1d303b 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml
@@ -3,7 +3,12 @@ label: Drupal 6 comment type
 source:
   plugin: variable
   variables:
+  # We just need a single one of these, include a few to be sure.
     - site_name
+    - menu_expanded
+    - menu_masks
+    - css_js_query_string
+    - clean_url
   constants:
     entity_type: node
     id: comment