diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index aaffebc..531bc13 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processField
-core: 6
 source:
   plugin: d6_field
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
index 9855f1c..7496db3 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldFormatter
-core: 6
 source:
   plugin: d6_field_instance_per_view_mode
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index 4b48d8d..b5035c2 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldInstance
-core: 6
 source:
   plugin: d6_field_instance
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
index df943de..46b7d75 100644
--- a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldWidget
-core: 6
 source:
   plugin: d6_field_instance_per_form_display
   constants:
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 6017994..18135af 100755
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 7
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processField
-core: 7
 source:
   plugin: d7_field
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_formatter_settings.yml b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
index 3fc0272..ee07ec4 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 7
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldFormatter
-core: 7
 source:
   plugin: d7_field_instance_per_view_mode
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index 9ac1626..b6d2497 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 7
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldInstance
-core: 7
 source:
   plugin: d7_field_instance
   constants:
diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
index b4dff13..f88f2d2 100644
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 7
 class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
 cck_plugin_method: processFieldWidget
-core: 7
 source:
   plugin: d7_field_instance_per_form_display
   constants:
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
index 2679fa5..9e9d7cd 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php
@@ -33,8 +33,12 @@ public function createInstance($field_type, array $configuration = array(), Migr
     if (!empty($configuration['core'])) {
       $core = $configuration['core'];
     }
-    else if (!empty($migration->getPluginDefinition()['core'])) {
-      $core = $migration->getPluginDefinition()['core'];
+    else if (!empty($migration->getPluginDefinition()['migration_tags'])) {
+      foreach ($migration->getPluginDefinition()['migration_tags'] as $tag) {
+        if ($tag == 'Drupal 7') {
+          $core = 7;
+        }
+      }
     }
     foreach ($this->getDefinitions() as $plugin_id => $definition) {
       if (in_array($core, $definition['core'])) {