reverted:
--- b/core/modules/action/migration_templates/d6_action.yml
+++ a/core/modules/action/migration_templates/d6_action.yml
@@ -37,4 +37,3 @@
       callable: unserialize
 destination:
   plugin: entity:action
-  provider: action
reverted:
--- b/core/modules/action/migration_templates/d7_action.yml
+++ a/core/modules/action/migration_templates/d7_action.yml
@@ -34,4 +34,3 @@
       callable: unserialize
 destination:
   plugin: entity:action
-  provider: action
reverted:
--- b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
+++ a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
@@ -17,4 +17,3 @@
   modified: modified
 destination:
   plugin: entity:aggregator_feed
-  provider: aggregator
reverted:
--- b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
+++ a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
@@ -18,7 +18,6 @@
   guid: guid
 destination:
   plugin: entity:aggregator_item
-  provider: aggregator
 migration_dependencies:
   required:
     - d6_aggregator_feed
reverted:
--- b/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
+++ a/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
@@ -18,5 +18,3 @@
   modified: modified
 destination:
   plugin: entity:aggregator_feed
-  provider: aggregator
-
reverted:
--- b/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
+++ a/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
@@ -18,7 +18,6 @@
   guid: guid
 destination:
   plugin: entity:aggregator_item
-  provider: aggregator
 migration_dependencies:
   required:
     - d7_aggregator_feed
reverted:
--- b/core/modules/ban/migration_templates/d7_blocked_ips.yml
+++ a/core/modules/ban/migration_templates/d7_blocked_ips.yml
@@ -8,4 +8,3 @@
   ip: ip
 destination:
   plugin: blocked_ip
-  provider: ban
reverted:
--- b/core/modules/block/migration_templates/d6_block.yml
+++ a/core/modules/block/migration_templates/d6_block.yml
@@ -95,7 +95,6 @@
     skip_php: true
 destination:
   plugin: entity:block
-  provider: block
 migration_dependencies:
   required:
     - menu
reverted:
--- b/core/modules/block/migration_templates/d7_block.yml
+++ a/core/modules/block/migration_templates/d7_block.yml
@@ -104,7 +104,6 @@
     skip_php: true
 destination:
   plugin: entity:block
-  provider: block
 migration_dependencies:
   optional:
     - d7_custom_block
diff -u b/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migration_templates/block_content_body_field.yml
--- b/core/modules/block_content/migration_templates/block_content_body_field.yml
+++ b/core/modules/block_content/migration_templates/block_content_body_field.yml
@@ -28,7 +28,6 @@
   'settings/display_summary': display_summary
 destination:
   plugin: entity:field_config
-  provider: block_content
 migration_dependencies:
   required:
     - block_content_type
diff -u b/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migration_templates/block_content_type.yml
--- b/core/modules/block_content/migration_templates/block_content_type.yml
+++ b/core/modules/block_content/migration_templates/block_content_type.yml
@@ -18,7 +18,6 @@
   label: label
 destination:
   plugin: entity:block_content_type
-  provider: block_content
 provider:
   - block_content
   - migrate_drupal
reverted:
--- b/core/modules/block_content/migration_templates/d6_custom_block.yml
+++ a/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -16,7 +16,6 @@
   plugin: entity:block_content
   default_bundle: basic
   no_stub: true
-  provider: block
 migration_dependencies:
   required:
     - d6_filter_format
reverted:
--- b/core/modules/block_content/migration_templates/d7_custom_block.yml
+++ a/core/modules/block_content/migration_templates/d7_custom_block.yml
@@ -16,7 +16,6 @@
   plugin: entity:block_content
   default_bundle: basic
   no_stub: true
-  provider: block
 migration_dependencies:
   required:
     - d7_filter_format
reverted:
--- b/core/modules/book/migration_templates/d6_book.yml
+++ a/core/modules/book/migration_templates/d6_book.yml
@@ -18,7 +18,6 @@
       migration: d6_book
 destination:
   plugin: book
-  provider: book
 migration_dependencies:
   required:
     - d6_node
reverted:
--- b/core/modules/comment/migration_templates/d6_comment.yml
+++ a/core/modules/comment/migration_templates/d6_comment.yml
@@ -37,7 +37,6 @@
     source: format
 destination:
   plugin: entity:comment
-  provider: comment
 migration_dependencies:
   required:
     - d6_node
diff -u b/core/modules/comment/migration_templates/d6_comment_entity_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
--- b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
@@ -21,7 +21,6 @@
   bundle: node_type
 destination:
   plugin: component_entity_display
-  provider: comment
 migration_dependencies:
   required:
     - d6_comment_field_instance
diff -u b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
--- b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
@@ -20,7 +20,6 @@
   bundle: node_type
 destination:
   plugin: component_entity_form_display
-  provider: comment
 migration_dependencies:
   required:
     - d6_comment_field_instance
diff -u b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
--- b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
@@ -27,7 +27,6 @@
   bundle: comment_type
 destination:
   plugin: component_entity_form_display
-  provider: comment
 migration_dependencies:
   required:
     - d6_comment_type
diff -u b/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml
--- b/core/modules/comment/migration_templates/d6_comment_field.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field.yml
@@ -15,7 +15,6 @@
   'settings/comment_type': comment_type
 destination:
   plugin: entity:field_storage_config
-  provider: comment
   dependencies:
     module:
       - comment
diff -u b/core/modules/comment/migration_templates/d6_comment_field_instance.yml b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
--- b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
@@ -39,7 +39,6 @@
   'settings/preview': comment_preview
 destination:
   plugin: entity:field_config
-  provider: comment
 migration_dependencies:
   required:
     - d6_comment_field
diff -u b/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml
--- b/core/modules/comment/migration_templates/d6_comment_type.yml
+++ b/core/modules/comment/migration_templates/d6_comment_type.yml
@@ -17 +16,0 @@
-  provider: comment
reverted:
--- b/core/modules/comment/migration_templates/d7_comment.yml
+++ a/core/modules/comment/migration_templates/d7_comment.yml
@@ -31,7 +31,6 @@
   comment_body: comment_body
 destination:
   plugin: entity:comment
-  provider: comment
 migration_dependencies:
   required:
     - d7_node
reverted:
--- b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
+++ a/core/modules/comment/migration_templates/d7_comment_entity_display.yml
@@ -19,7 +19,6 @@
   bundle: node_type
 destination:
   plugin: component_entity_display
-  provider: comment
 migration_dependencies:
   required:
     - d7_comment_field_instance
reverted:
--- b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
+++ a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
@@ -19,7 +19,6 @@
   bundle: node_type
 destination:
   plugin: component_entity_form_display
-  provider: comment
 migration_dependencies:
   required:
     - d7_comment_field_instance
reverted:
--- b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
+++ a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
@@ -25,7 +25,6 @@
   bundle: bundle
 destination:
   plugin: component_entity_form_display
-  provider: comment
 migration_dependencies:
   required:
     - d7_comment_type
reverted:
--- b/core/modules/comment/migration_templates/d7_comment_field.yml
+++ a/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -14,7 +14,6 @@
   'settings/comment_type': bundle
 destination:
   plugin: entity:field_storage_config
-  provider: comment
 migration_dependencies:
   required:
     - d7_comment_type
reverted:
--- b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ a/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -22,7 +22,6 @@
   'settings/preview': preview
 destination:
   plugin: entity:field_config
-  provider: comment
 migration_dependencies:
   required:
     - d7_comment_field
reverted:
--- b/core/modules/comment/migration_templates/d7_comment_type.yml
+++ a/core/modules/comment/migration_templates/d7_comment_type.yml
@@ -12,7 +12,6 @@
   label: label
 destination:
   plugin: entity:comment_type
-  provider: comment
 migration_dependencies:
   required:
     - d7_node_type
reverted:
--- b/core/modules/contact/migration_templates/contact_category.yml
+++ a/core/modules/contact/migration_templates/contact_category.yml
@@ -21,4 +21,3 @@
   weight: weight
 destination:
   plugin: entity:contact_form
-  provider: contact
reverted:
--- b/core/modules/field/migration_templates/d6_field.yml
+++ a/core/modules/field/migration_templates/d6_field.yml
@@ -124,4 +124,3 @@
       - global_settings
 destination:
   plugin: entity:field_storage_config
-  provider: field
reverted:
--- b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -258,7 +258,6 @@
 
 destination:
   plugin: component_entity_display
-  provider: field
 migration_dependencies:
   required:
     - d6_field_instance
reverted:
--- b/core/modules/field/migration_templates/d6_field_instance.yml
+++ a/core/modules/field/migration_templates/d6_field_instance.yml
@@ -55,7 +55,6 @@
 
 destination:
   plugin: entity:field_config
-  provider: field
 migration_dependencies:
   required:
     - d6_node_type
reverted:
--- b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
+++ a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
@@ -64,7 +64,6 @@
 
 destination:
   plugin: component_entity_form_display
-  provider: field
 migration_dependencies:
   required:
     - d6_field_instance
diff -u b/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
--- b/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -45 +44,0 @@
-  provider: field
reverted:
--- b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -74,7 +74,6 @@
   "options/third_party_settings": 'constants/third_party_settings'
 destination:
   plugin: component_entity_display
-  provider: field
 migration_dependencies:
   required:
     - d7_field_instance
reverted:
--- b/core/modules/field/migration_templates/d7_field_instance.yml
+++ a/core/modules/field/migration_templates/d7_field_instance.yml
@@ -30,7 +30,6 @@
       - widget_settings
 destination:
   plugin: entity:field_config
-  provider: field
 migration_dependencies:
   required:
     - d7_field
diff -u b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
--- b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -57,7 +57,6 @@
   'options/third_party_settings': 'constants/third_party_settings'
 destination:
   plugin: component_entity_form_display
-  provider: field
 migration_dependencies:
   required:
     - d7_field_instance
diff -u b/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migration_templates/d7_view_modes.yml
--- b/core/modules/field/migration_templates/d7_view_modes.yml
+++ b/core/modules/field/migration_templates/d7_view_modes.yml
@@ -30,2 +29,0 @@
-  provider: field
-
diff -u b/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
--- b/core/modules/file/migration_templates/d6_file.yml
+++ b/core/modules/file/migration_templates/d6_file.yml
@@ -50 +49,0 @@
-  provider: file
reverted:
--- b/core/modules/file/migration_templates/d6_upload.yml
+++ a/core/modules/file/migration_templates/d6_upload.yml
@@ -20,7 +20,6 @@
       description: description
 destination:
   plugin: entity:node
-  provider: file
 migration_dependencies:
   required:
     - d6_file
reverted:
--- b/core/modules/file/migration_templates/d6_upload_entity_display.yml
+++ a/core/modules/file/migration_templates/d6_upload_entity_display.yml
@@ -22,7 +22,6 @@
   'options/type': '@type'
 destination:
   plugin: component_entity_display
-  provider: file
 migration_dependencies:
   required:
     - d6_upload_field_instance
reverted:
--- b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
+++ a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
@@ -23,7 +23,6 @@
   'options/type': '@type'
 destination:
   plugin: component_entity_form_display
-  provider: file
 migration_dependencies:
   required:
     - d6_upload_field_instance
diff -u b/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml
--- b/core/modules/file/migration_templates/d6_upload_field.yml
+++ b/core/modules/file/migration_templates/d6_upload_field.yml
@@ -22,7 +22,6 @@
   'settings/display_field': 'constants/display_field'
 destination:
   plugin: entity:field_storage_config
-  provider: file
   dependencies:
     module:
       - file
reverted:
--- b/core/modules/file/migration_templates/d6_upload_field_instance.yml
+++ a/core/modules/file/migration_templates/d6_upload_field_instance.yml
@@ -25,7 +25,6 @@
   'settings/max_filesize': max_filesize
 destination:
   plugin: entity:field_config
-  provider: file
 migration_dependencies:
   required:
     - d6_upload_field
diff -u b/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
--- b/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -47 +46,0 @@
-  provider: file
diff -u b/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
--- b/core/modules/filter/migration_templates/d6_filter_format.yml
+++ b/core/modules/filter/migration_templates/d6_filter_format.yml
@@ -46,2 +45,0 @@
-  provider: filter
-
diff -u b/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml
--- b/core/modules/filter/migration_templates/d7_filter_format.yml
+++ b/core/modules/filter/migration_templates/d7_filter_format.yml
@@ -38,2 +37,0 @@
-  provider: filter
-
reverted:
--- b/core/modules/image/migration_templates/d6_imagecache_presets.yml
+++ a/core/modules/image/migration_templates/d6_imagecache_presets.yml
@@ -22,4 +22,3 @@
       - data
 destination:
   plugin: entity:image_style
-  provider: image
reverted:
--- b/core/modules/image/migration_templates/d7_image_styles.yml
+++ a/core/modules/image/migration_templates/d7_image_styles.yml
@@ -16,4 +16,3 @@
       data: data
 destination:
   plugin: entity:image_style
-  provider: image
diff -u b/core/modules/language/migration_templates/d6_language_content_settings.yml b/core/modules/language/migration_templates/d6_language_content_settings.yml
--- b/core/modules/language/migration_templates/d6_language_content_settings.yml
+++ b/core/modules/language/migration_templates/d6_language_content_settings.yml
@@ -43,7 +43,6 @@
   plugin: entity:language_content_settings
   content_translation_update_definitions:
     - node
-  provider: language
 migration_dependencies:
   required:
     - d6_node_type
diff -u b/core/modules/language/migration_templates/d7_language_content_settings.yml b/core/modules/language/migration_templates/d7_language_content_settings.yml
--- b/core/modules/language/migration_templates/d7_language_content_settings.yml
+++ b/core/modules/language/migration_templates/d7_language_content_settings.yml
@@ -42,7 +42,6 @@
   plugin: entity:language_content_settings
   content_translation_update_definitions:
     - node
-  provider: language
 migration_dependencies:
   required:
     - d7_node_type
diff -u b/core/modules/language/migration_templates/default_language.yml b/core/modules/language/migration_templates/default_language.yml
--- b/core/modules/language/migration_templates/default_language.yml
+++ b/core/modules/language/migration_templates/default_language.yml
@@ -34,7 +34,6 @@
 destination:
   plugin: default_langcode
   config_name: system.site
-  provider: language
 migration_dependencies:
   required:
     - language
reverted:
--- b/core/modules/language/migration_templates/language.yml
+++ a/core/modules/language/migration_templates/language.yml
@@ -17,4 +17,3 @@
   weight: weight
 destination:
   plugin: entity:configurable_language
-  provider: language
reverted:
--- b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
+++ a/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
@@ -51,7 +51,6 @@
   plugin: entity:menu_link_content
   default_bundle: menu_link_content
   no_stub: true
-  provider: menu_link_content
 migration_dependencies:
   required:
     - d6_menu
reverted:
--- b/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
+++ a/core/modules/menu_link_content/migration_templates/d7_menu_links.yml
@@ -47,7 +47,6 @@
 destination:
   plugin: entity:menu_link_content
   no_stub: true
-  provider: menu_link_content
 migration_dependencies:
   required:
     - d7_menu
diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
--- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -427,6 +427,9 @@
             $destination_module = explode('.', $configuration_destination, 2)[0];
           }
         }
+        else {
+          $destination_module = $migration->getDestinationPlugin()->getPluginDefinition()['provider'];
+        }
       }
       if (!$destination_module) {
         drupal_set_message(t('Destination provider not found for @migration_id.', ['@migration_id' => $migration_id]), 'error');
reverted:
--- b/core/modules/node/migration_templates/d6_node.yml
+++ a/core/modules/node/migration_templates/d6_node.yml
@@ -42,7 +42,6 @@
 
 destination:
   plugin: entity:node
-  provider: node
 migration_dependencies:
   required:
     - d6_user
reverted:
--- b/core/modules/node/migration_templates/d6_node_revision.yml
+++ a/core/modules/node/migration_templates/d6_node_revision.yml
@@ -39,5 +39,3 @@
 
 destination:
   plugin: entity_revision:node
-  provider: node
-
reverted:
--- b/core/modules/node/migration_templates/d6_node_setting_promote.yml
+++ a/core/modules/node/migration_templates/d6_node_setting_promote.yml
@@ -17,7 +17,6 @@
   'default_value/0/value': 'options/promote'
 destination:
   plugin: entity:base_field_override
-  provider: node
 migration_dependencies:
   required:
     - d6_node_type
reverted:
--- b/core/modules/node/migration_templates/d6_node_setting_status.yml
+++ a/core/modules/node/migration_templates/d6_node_setting_status.yml
@@ -17,7 +17,6 @@
   'default_value/0/value': 'options/status'
 destination:
   plugin: entity:base_field_override
-  provider: node
 migration_dependencies:
   required:
     - d6_node_type
reverted:
--- b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
+++ a/core/modules/node/migration_templates/d6_node_setting_sticky.yml
@@ -17,7 +17,6 @@
   'default_value/0/value': 'options/sticky'
 destination:
   plugin: entity:base_field_override
-  provider: node
 migration_dependencies:
   required:
     - d6_node_type
reverted:
--- b/core/modules/node/migration_templates/d6_node_translation.yml
+++ a/core/modules/node/migration_templates/d6_node_translation.yml
@@ -41,7 +41,6 @@
 destination:
   plugin: entity:node
   translations: true
-  provider: node
 migration_dependencies:
   required:
     - d6_user
reverted:
--- b/core/modules/node/migration_templates/d6_node_type.yml
+++ a/core/modules/node/migration_templates/d6_node_type.yml
@@ -22,4 +22,3 @@
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-  provider: node
reverted:
--- b/core/modules/node/migration_templates/d6_view_modes.yml
+++ a/core/modules/node/migration_templates/d6_view_modes.yml
@@ -36,4 +36,3 @@
   status: 'constants/status'
 destination:
   plugin: entity:entity_view_mode
-  provider: node
reverted:
--- b/core/modules/node/migration_templates/d7_node.yml
+++ a/core/modules/node/migration_templates/d7_node.yml
@@ -26,7 +26,6 @@
   revision_timestamp: timestamp
 destination:
   plugin: entity:node
-  provider: node
 migration_dependencies:
   required:
     - d7_user
reverted:
--- b/core/modules/node/migration_templates/d7_node_revision.yml
+++ a/core/modules/node/migration_templates/d7_node_revision.yml
@@ -26,7 +26,6 @@
   revision_timestamp: timestamp
 destination:
   plugin: entity_revision:node
-  provider: node
 migration_dependencies:
   required:
     - d7_node
reverted:
--- b/core/modules/node/migration_templates/d7_node_title_label.yml
+++ a/core/modules/node/migration_templates/d7_node_title_label.yml
@@ -14,7 +14,6 @@
   label: title_label
 destination:
   plugin: entity:base_field_override
-  provider: node
 migration_dependencies:
   required:
     - d7_node_type
reverted:
--- b/core/modules/node/migration_templates/d7_node_type.yml
+++ a/core/modules/node/migration_templates/d7_node_type.yml
@@ -19,4 +19,3 @@
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-  provider: node
reverted:
--- b/core/modules/path/migration_templates/d6_url_alias.yml
+++ a/core/modules/path/migration_templates/d6_url_alias.yml
@@ -34,4 +34,3 @@
       migration: d6_node_translation
 destination:
   plugin: url_alias
-  provider: path
reverted:
--- b/core/modules/path/migration_templates/d7_url_alias.yml
+++ a/core/modules/path/migration_templates/d7_url_alias.yml
@@ -20,4 +20,3 @@
   langcode: language
 destination:
   plugin: url_alias
-  provider: path
diff -u b/core/modules/search/migration_templates/search_page.yml b/core/modules/search/migration_templates/search_page.yml
--- b/core/modules/search/migration_templates/search_page.yml
+++ b/core/modules/search/migration_templates/search_page.yml
@@ -28 +27,0 @@
-  provider: search
reverted:
--- b/core/modules/shortcut/migration_templates/d7_shortcut.yml
+++ a/core/modules/shortcut/migration_templates/d7_shortcut.yml
@@ -20,7 +20,6 @@
       - link_path
 destination:
   plugin: entity:shortcut
-  provider: shortcut
 migration_dependencies:
   required:
     - d7_shortcut_set
reverted:
--- b/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
+++ a/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
@@ -18,5 +18,3 @@
   label: title
 destination:
   plugin: entity:shortcut_set
-  provider: shortcut
-
reverted:
--- b/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
+++ a/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
@@ -19,7 +19,6 @@
     source: set_name
 destination:
   plugin: shortcut_set_users
-  provider: shortcut
 migration_dependencies:
   required:
     - d7_shortcut_set
diff -u b/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml
--- b/core/modules/system/migration_templates/d6_date_formats.yml
+++ b/core/modules/system/migration_templates/d6_date_formats.yml
@@ -23 +22,0 @@
-  provider: system
reverted:
--- b/core/modules/system/migration_templates/d6_menu.yml
+++ a/core/modules/system/migration_templates/d6_menu.yml
@@ -11,4 +11,3 @@
   description: description
 destination:
   plugin: entity:menu
-  provider: system
reverted:
--- b/core/modules/system/migration_templates/d7_menu.yml
+++ a/core/modules/system/migration_templates/d7_menu.yml
@@ -18,4 +18,3 @@
   description: description
 destination:
   plugin: entity:menu
-  provider: system
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -31,7 +31,6 @@
   changed: timestamp
 destination:
   plugin: entity:taxonomy_term
-  provider: taxonomy
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -22,5 +22,3 @@
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-  provider: taxonomy
-
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_term_node.yml
+++ a/core/modules/taxonomy/migration_templates/d6_term_node.yml
@@ -18,7 +18,6 @@
   # The actual field name is dynamic and will be added by the builder.
 destination:
   plugin: entity:node
-  provider: taxonomy
 migration_dependencies:
   required:
     - d6_vocabulary_entity_display
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
+++ a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -18,7 +18,6 @@
   # The actual field name is dynamic and will be added by the builder.
 destination:
   plugin: entity_revision:node
-  provider: taxonomy
 migration_dependencies:
   required:
     - d6_term_node
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
+++ a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -22,7 +22,6 @@
     source: vid
 destination:
   plugin: component_entity_display
-  provider: taxonomy
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
+++ a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
@@ -26,7 +26,6 @@
     source: vid
 destination:
   plugin: component_entity_form_display
-  provider: taxonomy
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -23,7 +23,6 @@
   cardinality: cardinality
 destination:
   plugin: entity:field_storage_config
-  provider: taxonomy
   dependencies:
     module:
       - entity_reference
reverted:
--- b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
+++ a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -26,7 +26,6 @@
   required: required
 destination:
   plugin: entity:field_config
-  provider: taxonomy
 migration_dependencies:
   required:
     - d6_node_type
reverted:
--- b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
+++ a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
@@ -33,7 +33,6 @@
   changed: timestamp
 destination:
   plugin: entity:taxonomy_term
-  provider: taxonomy
 migration_dependencies:
   required:
     - d7_taxonomy_vocabulary
reverted:
--- b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -13,4 +13,3 @@
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-  provider: taxonomy
reverted:
--- b/core/modules/tracker/migration_templates/d7_tracker_node.yml
+++ a/core/modules/tracker/migration_templates/d7_tracker_node.yml
@@ -10,7 +10,6 @@
   changed: changed
 destination:
   plugin: entity:node
-  provider: node
 migration_dependencies:
   required:
     - d7_user
reverted:
--- b/core/modules/tracker/migration_templates/d7_tracker_user.yml
+++ a/core/modules/tracker/migration_templates/d7_tracker_user.yml
@@ -11,7 +11,6 @@
   changed: changed
 destination:
   plugin: entity:user
-  provider: user
 migration_dependencies:
   required:
     - d7_user
reverted:
--- b/core/modules/user/migration_templates/d6_profile_values.yml
+++ a/core/modules/user/migration_templates/d6_profile_values.yml
@@ -9,7 +9,6 @@
   uid: uid
 destination:
   plugin: entity:user
-  provider: user
 migration_dependencies:
   required:
     - d6_user
reverted:
--- b/core/modules/user/migration_templates/d6_user.yml
+++ a/core/modules/user/migration_templates/d6_user.yml
@@ -43,7 +43,6 @@
 destination:
   plugin: entity:user
   md5_passwords: true
-  provider: user
 migration_dependencies:
   required:
     - d6_user_role
reverted:
--- b/core/modules/user/migration_templates/d6_user_contact_settings.yml
+++ a/core/modules/user/migration_templates/d6_user_contact_settings.yml
@@ -18,7 +18,6 @@
 
 destination:
   plugin: user_data
-  provider: user
 migration_dependencies:
   required:
     - d6_user
reverted:
--- b/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ a/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -39,7 +39,6 @@
       - '@destination_full_path'
 destination:
   plugin: entity:file
-  provider: user
 migration_dependencies:
   # Every migration that references a file by Drupal 6 fid should specify d6_file as an
   # optional dependency.
reverted:
--- b/core/modules/user/migration_templates/d6_user_role.yml
+++ a/core/modules/user/migration_templates/d6_user_role.yml
@@ -36,7 +36,6 @@
     - plugin: filter_format_permission
 destination:
   plugin: entity:user_role
-  provider: user
 migration_dependencies:
   required:
     - d6_filter_format
reverted:
--- b/core/modules/user/migration_templates/d7_user.yml
+++ a/core/modules/user/migration_templates/d7_user.yml
@@ -44,7 +44,6 @@
       migration: d7_file
 destination:
   plugin: entity:user
-  provider: user
 migration_dependencies:
   required:
     - d7_user_role
diff -u b/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml
--- b/core/modules/user/migration_templates/d7_user_role.yml
+++ b/core/modules/user/migration_templates/d7_user_role.yml
@@ -35,7 +35,6 @@
   weight: weight
 destination:
   plugin: entity:user_role
-  provider: user
 migration_dependencies:
   optional:
     - d7_filter_format
diff -u b/core/modules/user/migration_templates/user_picture_entity_display.yml b/core/modules/user/migration_templates/user_picture_entity_display.yml
--- b/core/modules/user/migration_templates/user_picture_entity_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_display.yml
@@ -27,7 +27,6 @@
   'options/type': '@type'
 destination:
   plugin: component_entity_display
-  provider: user
 migration_dependencies:
   required:
     - user_picture_field_instance
diff -u b/core/modules/user/migration_templates/user_picture_entity_form_display.yml b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
--- b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
@@ -26,7 +26,6 @@
   'options/type': '@type'
 destination:
   plugin: component_entity_form_display
-  provider: user
 migration_dependencies:
   required:
     - user_picture_field_instance
diff -u b/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml
--- b/core/modules/user/migration_templates/user_picture_field.yml
+++ b/core/modules/user/migration_templates/user_picture_field.yml
@@ -20,7 +20,6 @@
   cardinality: 'constants/cardinality'
 destination:
   plugin: entity:field_storage_config
-  provider: user
   dependencies:
     module:
       - image
diff -u b/core/modules/user/migration_templates/user_picture_field_instance.yml b/core/modules/user/migration_templates/user_picture_field_instance.yml
--- b/core/modules/user/migration_templates/user_picture_field_instance.yml
+++ b/core/modules/user/migration_templates/user_picture_field_instance.yml
@@ -27,7 +27,6 @@
   'settings/max_resolution': max_resolution
 destination:
   plugin: entity:field_config
-  provider: user
 migration_dependencies:
   required:
     - user_picture_field
reverted:
--- b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
+++ a/core/modules/user/migration_templates/user_profile_entity_form_display.yml
@@ -48,8 +48,6 @@
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_form_display
-  provider: user
 migration_dependencies:
   required:
     - user_profile_field_instance
-
reverted:
--- b/core/modules/user/migration_templates/user_profile_field.yml
+++ a/core/modules/user/migration_templates/user_profile_field.yml
@@ -33,4 +33,3 @@
       list: -1
 destination:
   plugin: entity:field_storage_config
-  provider: user
reverted:
--- b/core/modules/user/migration_templates/user_profile_field_instance.yml
+++ a/core/modules/user/migration_templates/user_profile_field_instance.yml
@@ -17,7 +17,6 @@
   required: required
 destination:
   plugin: entity:field_config
-  provider: user
 migration_dependencies:
   required:
     - user_profile_field
only in patch2:
unchanged:
--- a/core/modules/language/migration_templates/d6_language_negotiation_settings.yml
+++ b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml
@@ -6,6 +6,7 @@ source:
   plugin: variable
   variables:
     - language_negotiation
+  provider: language
 process:
   session/parameter:
     plugin: default_value
only in patch2:
unchanged:
--- a/core/modules/language/migration_templates/d6_language_types.yml
+++ b/core/modules/language/migration_templates/d6_language_types.yml
@@ -6,6 +6,7 @@ source:
   plugin: variable
   variables:
     - language_negotiation
+  provider: language
 process:
   all:
     plugin: default_value
only in patch2:
unchanged:
--- a/core/modules/language/migration_templates/d7_language_types.yml
+++ b/core/modules/language/migration_templates/d7_language_types.yml
@@ -12,6 +12,7 @@ source:
     - locale_language_providers_weight_language
     - locale_language_providers_weight_language_content
     - locale_language_providers_weight_language_url
+  provider: language
 process:
   all:
     plugin: language_types