From fca71fa109dee40cc98ce6d672b6e1bc83c220f5 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 15 Jul 2016 00:18:52 +0200
Subject: [PATCH] Revert "Issue #2560795 by mikeryan, phenaproxima, penyaskito,
 willwh, benjy: Source plugins have a hidden dependency on migrate_drupal"

This reverts commit 89815ba33923ecd0018b62afb393d05d987a40fa.
---
 .../action/migration_templates/d6_action.yml  |  1 -
 .../d6_action_settings.yml                    |  1 -
 .../action/migration_templates/d7_action.yml  |  1 -
 .../d6_aggregator_feed.yml                    |  1 -
 .../d6_aggregator_item.yml                    |  1 -
 .../d6_aggregator_settings.yml                |  1 -
 .../d7_aggregator_feed.yml                    |  1 -
 .../d7_aggregator_item.yml                    |  1 -
 .../d7_aggregator_settings.yml                |  1 -
 .../migration_templates/d7_blocked_ips.yml    |  1 -
 .../block/migration_templates/d6_block.yml    |  1 -
 .../block/migration_templates/d7_block.yml    |  1 -
 .../block_content_body_field.yml              |  1 -
 .../block_content_type.yml                    |  1 -
 .../migration_templates/d6_custom_block.yml   |  1 -
 .../migration_templates/d7_custom_block.yml   |  1 -
 .../book/migration_templates/d6_book.yml      |  1 -
 .../migration_templates/d6_book_settings.yml  |  1 -
 .../migration_templates/d6_comment.yml        |  1 -
 .../d6_comment_entity_display.yml             |  1 -
 .../d6_comment_entity_form_display.yml        |  1 -
 ...d6_comment_entity_form_display_subject.yml |  1 -
 .../migration_templates/d6_comment_field.yml  |  1 -
 .../d6_comment_field_instance.yml             |  1 -
 .../migration_templates/d6_comment_type.yml   |  1 -
 .../migration_templates/d7_comment.yml        |  1 -
 .../d7_comment_entity_display.yml             |  1 -
 .../d7_comment_entity_form_display.yml        |  1 -
 ...d7_comment_entity_form_display_subject.yml |  1 -
 .../migration_templates/d7_comment_field.yml  |  1 -
 .../d7_comment_field_instance.yml             |  1 -
 .../migration_templates/d7_comment_type.yml   |  1 -
 .../migration_templates/contact_category.yml  |  1 -
 .../d6_contact_settings.yml                   |  1 -
 .../d7_contact_settings.yml                   |  1 -
 .../migration_templates/d6_dblog_settings.yml |  1 -
 .../migration_templates/d7_dblog_settings.yml |  1 -
 .../field/migration_templates/d6_field.yml    |  1 -
 .../d6_field_formatter_settings.yml           |  1 -
 .../migration_templates/d6_field_instance.yml |  1 -
 .../d6_field_instance_widget_settings.yml     |  1 -
 .../field/migration_templates/d7_field.yml    |  1 -
 .../d7_field_formatter_settings.yml           |  1 -
 .../migration_templates/d7_field_instance.yml |  1 -
 .../d7_field_instance_widget_settings.yml     |  1 -
 .../migration_templates/d7_view_modes.yml     |  1 -
 .../file/migration_templates/d6_file.yml      |  1 -
 .../migration_templates/d6_file_settings.yml  |  1 -
 .../file/migration_templates/d6_upload.yml    |  1 -
 .../d6_upload_entity_display.yml              |  1 -
 .../d6_upload_entity_form_display.yml         |  1 -
 .../migration_templates/d6_upload_field.yml   |  1 -
 .../d6_upload_field_instance.yml              |  1 -
 .../file/migration_templates/d7_file.yml      |  1 -
 .../migration_templates/d6_filter_format.yml  |  1 -
 .../migration_templates/d7_filter_format.yml  |  1 -
 .../migration_templates/d6_forum_settings.yml |  1 -
 .../migration_templates/d7_forum_settings.yml |  1 -
 .../d6_imagecache_presets.yml                 |  1 -
 .../migration_templates/d7_image_settings.yml |  1 -
 .../migration_templates/d7_image_styles.yml   |  1 -
 .../d7_language_negotiation_settings.yml      |  1 -
 .../language/migration_templates/language.yml |  1 -
 .../migration_templates/locale_settings.yml   |  1 -
 .../migration_templates/menu_links.yml        |  1 -
 .../migration_templates/menu_settings.yml     |  1 -
 ...eContainerDerivativeDiscoveryDecorator.php | 50 --------------
 .../src/Plugin/MigrationPluginManager.php     |  4 +-
 .../Kernel/Plugin/MigrationPluginListTest.php | 65 -------------------
 .../migration_templates/users.yml             |  1 -
 .../node/migration_templates/d6_node.yml      |  1 -
 .../migration_templates/d6_node_revision.yml  |  1 -
 .../d6_node_setting_promote.yml               |  1 -
 .../d6_node_setting_status.yml                |  1 -
 .../d6_node_setting_sticky.yml                |  1 -
 .../migration_templates/d6_node_settings.yml  |  1 -
 .../node/migration_templates/d6_node_type.yml |  1 -
 .../migration_templates/d6_view_modes.yml     |  1 -
 .../node/migration_templates/d7_node.yml      |  1 -
 .../migration_templates/d7_node_revision.yml  |  1 -
 .../migration_templates/d7_node_settings.yml  |  1 -
 .../d7_node_title_label.yml                   |  1 -
 .../node/migration_templates/d7_node_type.yml |  1 -
 .../path/migration_templates/d6_url_alias.yml |  1 -
 .../path/migration_templates/d7_url_alias.yml |  1 -
 .../d6_search_settings.yml                    |  1 -
 .../d7_search_settings.yml                    |  1 -
 .../migration_templates/search_page.yml       |  1 -
 .../migration_templates/d7_shortcut.yml       |  1 -
 .../migration_templates/d7_shortcut_set.yml   |  1 -
 .../d7_shortcut_set_users.yml                 |  1 -
 .../d6_simpletest_settings.yml                |  1 -
 .../d7_simpletest_settings.yml                |  1 -
 .../d6_statistics_settings.yml                |  1 -
 .../d6_syslog_settings.yml                    |  1 -
 .../d7_syslog_settings.yml                    |  1 -
 .../migration_templates/d6_date_formats.yml   |  1 -
 .../migration_templates/d6_system_cron.yml    |  1 -
 .../migration_templates/d6_system_date.yml    |  1 -
 .../migration_templates/d6_system_file.yml    |  1 -
 .../migration_templates/d6_system_image.yml   |  1 -
 .../d6_system_image_gd.yml                    |  1 -
 .../migration_templates/d6_system_logging.yml |  1 -
 .../d6_system_maintenance.yml                 |  1 -
 .../d6_system_performance.yml                 |  1 -
 .../migration_templates/d6_system_rss.yml     |  1 -
 .../migration_templates/d6_system_site.yml    |  1 -
 .../system/migration_templates/menu.yml       |  1 -
 .../migration_templates/d6_taxonomy_term.yml  |  1 -
 .../d6_taxonomy_vocabulary.yml                |  1 -
 .../migration_templates/d6_term_node.yml      |  1 -
 .../d6_term_node_revision.yml                 |  1 -
 .../d6_vocabulary_entity_display.yml          |  1 -
 .../d6_vocabulary_entity_form_display.yml     |  1 -
 .../d6_vocabulary_field.yml                   |  1 -
 .../d6_vocabulary_field_instance.yml          |  1 -
 .../migration_templates/d7_taxonomy_term.yml  |  1 -
 .../d7_taxonomy_vocabulary.yml                |  1 -
 .../migration_templates/taxonomy_settings.yml |  1 -
 .../migration_templates/text_settings.yml     |  1 -
 .../migration_templates/d7_tracker_node.yml   |  1 -
 .../d7_tracker_settings.yml                   |  1 -
 .../migration_templates/d7_tracker_user.yml   |  1 -
 .../migration_templates/update_settings.yml   |  1 -
 .../migration_templates/d6_profile_values.yml |  1 -
 .../user/migration_templates/d6_user.yml      |  1 -
 .../d6_user_contact_settings.yml              |  1 -
 .../user/migration_templates/d6_user_mail.yml |  1 -
 .../d6_user_picture_file.yml                  |  1 -
 .../user/migration_templates/d6_user_role.yml |  1 -
 .../migration_templates/d6_user_settings.yml  |  1 -
 .../user/migration_templates/d7_user.yml      |  1 -
 .../migration_templates/d7_user_flood.yml     |  1 -
 .../user/migration_templates/d7_user_mail.yml |  1 -
 .../user/migration_templates/d7_user_role.yml |  1 -
 .../user_picture_entity_display.yml           |  1 -
 .../user_picture_entity_form_display.yml      |  1 -
 .../user_picture_field.yml                    |  1 -
 .../user_picture_field_instance.yml           |  1 -
 .../user_profile_entity_display.yml           |  1 -
 .../user_profile_entity_form_display.yml      |  1 -
 .../user_profile_field.yml                    |  1 -
 .../user_profile_field_instance.yml           |  1 -
 143 files changed, 2 insertions(+), 257 deletions(-)
 delete mode 100644 core/modules/migrate/src/Plugin/Discovery/MigrateContainerDerivativeDiscoveryDecorator.php
 delete mode 100644 core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php

diff --git a/core/modules/action/migration_templates/d6_action.yml b/core/modules/action/migration_templates/d6_action.yml
index c03018015dc2..592ed1805d9a 100644
--- a/core/modules/action/migration_templates/d6_action.yml
+++ b/core/modules/action/migration_templates/d6_action.yml
@@ -37,4 +37,3 @@ process:
       callable: unserialize
 destination:
   plugin: entity:action
-provider: migrate_drupal
diff --git a/core/modules/action/migration_templates/d6_action_settings.yml b/core/modules/action/migration_templates/d6_action_settings.yml
index 9eb72bcce56c..f46092c62e55 100644
--- a/core/modules/action/migration_templates/d6_action_settings.yml
+++ b/core/modules/action/migration_templates/d6_action_settings.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: action.settings
-provider: migrate_drupal
diff --git a/core/modules/action/migration_templates/d7_action.yml b/core/modules/action/migration_templates/d7_action.yml
index cb74a706d54f..03b869af1835 100644
--- a/core/modules/action/migration_templates/d7_action.yml
+++ b/core/modules/action/migration_templates/d7_action.yml
@@ -34,4 +34,3 @@ process:
       callable: unserialize
 destination:
   plugin: entity:action
-provider: migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
index ad9a3f9e6fec..cad155374a86 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
@@ -17,4 +17,3 @@ process:
   modified: modified
 destination:
   plugin: entity:aggregator_feed
-provider: migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
index 9a597005e58d..fb4040ab1240 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
@@ -21,4 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_aggregator_feed
-provider: migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
index 522ef1d44fe3..72372e4093bf 100644
--- a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
@@ -23,4 +23,3 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
-provider: migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
index 5e338c98a36c..5dbeb25eaf40 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
@@ -18,4 +18,3 @@ process:
   modified: modified
 destination:
   plugin: entity:aggregator_feed
-provider: migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_item.yml b/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
index 6d2e9f8c3d07..9735e19da21f 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_item.yml
@@ -21,4 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d7_aggregator_feed
-provider: migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
index aaff46d42681..c8c793fdd193 100644
--- a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
@@ -23,4 +23,3 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
-provider: migrate_drupal
diff --git a/core/modules/ban/migration_templates/d7_blocked_ips.yml b/core/modules/ban/migration_templates/d7_blocked_ips.yml
index 14835b4c66f5..0122dc68104d 100644
--- a/core/modules/ban/migration_templates/d7_blocked_ips.yml
+++ b/core/modules/ban/migration_templates/d7_blocked_ips.yml
@@ -8,4 +8,3 @@ process:
   ip: ip
 destination:
   plugin: blocked_ip
-provider: migrate_drupal
diff --git a/core/modules/block/migration_templates/d6_block.yml b/core/modules/block/migration_templates/d6_block.yml
index fc208bbe9c31..8be753974d03 100644
--- a/core/modules/block/migration_templates/d6_block.yml
+++ b/core/modules/block/migration_templates/d6_block.yml
@@ -98,4 +98,3 @@ migration_dependencies:
     - menu
     - d6_custom_block
     - d6_user_role
-provider: migrate_drupal
diff --git a/core/modules/block/migration_templates/d7_block.yml b/core/modules/block/migration_templates/d7_block.yml
index 1986c2fea9c6..ff561118e866 100644
--- a/core/modules/block/migration_templates/d7_block.yml
+++ b/core/modules/block/migration_templates/d7_block.yml
@@ -101,4 +101,3 @@ migration_dependencies:
   optional:
     - d7_custom_block
     - d7_user_role
-provider: migrate_drupal
diff --git a/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migration_templates/block_content_body_field.yml
index 1e2d2455f65f..41484f8e8e58 100644
--- a/core/modules/block_content/migration_templates/block_content_body_field.yml
+++ b/core/modules/block_content/migration_templates/block_content_body_field.yml
@@ -30,4 +30,3 @@ destination:
 migration_dependencies:
   required:
     - block_content_type
-provider: migrate_drupal
diff --git a/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migration_templates/block_content_type.yml
index fe888300e282..7b77ba5140be 100644
--- a/core/modules/block_content/migration_templates/block_content_type.yml
+++ b/core/modules/block_content/migration_templates/block_content_type.yml
@@ -17,4 +17,3 @@ process:
   label: label
 destination:
   plugin: entity:block_content_type
-provider: migrate_drupal
diff --git a/core/modules/block_content/migration_templates/d6_custom_block.yml b/core/modules/block_content/migration_templates/d6_custom_block.yml
index e2ea0a416030..8394c64488b9 100644
--- a/core/modules/block_content/migration_templates/d6_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -20,4 +20,3 @@ migration_dependencies:
   required:
     - d6_filter_format
     - block_content_body_field
-provider: migrate_drupal
diff --git a/core/modules/block_content/migration_templates/d7_custom_block.yml b/core/modules/block_content/migration_templates/d7_custom_block.yml
index 2cda97a6ce84..42021fb2f0e4 100644
--- a/core/modules/block_content/migration_templates/d7_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d7_custom_block.yml
@@ -20,4 +20,3 @@ migration_dependencies:
   required:
     - d7_filter_format
     - block_content_body_field
-provider: migrate_drupal
diff --git a/core/modules/book/migration_templates/d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
index 6fc004b709d1..f5020c360416 100644
--- a/core/modules/book/migration_templates/d6_book.yml
+++ b/core/modules/book/migration_templates/d6_book.yml
@@ -21,4 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-provider: migrate_drupal
diff --git a/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml
index 5bc45dfd6966..16e669539894 100644
--- a/core/modules/book/migration_templates/d6_book_settings.yml
+++ b/core/modules/book/migration_templates/d6_book_settings.yml
@@ -15,4 +15,3 @@ process:
 destination:
   plugin: config
   config_name: book.settings
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d6_comment.yml b/core/modules/comment/migration_templates/d6_comment.yml
index 257f98c37190..a7ffc9dad566 100644
--- a/core/modules/comment/migration_templates/d6_comment.yml
+++ b/core/modules/comment/migration_templates/d6_comment.yml
@@ -43,4 +43,3 @@ migration_dependencies:
     - d6_comment_entity_form_display
     - d6_user
     - d6_filter_format
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
index e4e570c97fa2..c650673188a9 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_display.yml
@@ -23,4 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
index be74c342322e..c33685feb6b5 100644
--- a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
@@ -22,4 +22,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-provider: migrate_drupal
diff --git a/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
index 4edbc1a2b767..abe6191b8cbe 100644
--- a/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
@@ -29,4 +29,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml
index 1d01af38f7dd..469d604d072c 100644
--- a/core/modules/comment/migration_templates/d6_comment_field.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field.yml
@@ -17,4 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d6_comment_field_instance.yml b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
index 68a72a494f6d..d708619e1e0d 100644
--- a/core/modules/comment/migration_templates/d6_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d6_comment_field_instance.yml
@@ -42,4 +42,3 @@ migration_dependencies:
   required:
     - d6_comment_field
     - d6_node_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml
index 5e9b8401eb4d..69a2bd86519d 100644
--- a/core/modules/comment/migration_templates/d6_comment_type.yml
+++ b/core/modules/comment/migration_templates/d6_comment_type.yml
@@ -13,4 +13,3 @@ process:
   description: description
 destination:
   plugin: entity:comment_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
index d92d526255c4..5845999dae1c 100644
--- a/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -33,4 +33,3 @@ migration_dependencies:
   required:
     - d7_node
     - d7_comment_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
index 20a2dee09735..2004505f3c7d 100644
--- a/core/modules/comment/migration_templates/d7_comment_entity_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_display.yml
@@ -22,4 +22,3 @@ destination:
 migration_dependencies:
   required:
     - d7_comment_field_instance
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
index f479cc5b1cca..0315c4a4518f 100644
--- a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
@@ -22,4 +22,3 @@ destination:
 migration_dependencies:
   required:
     - d7_comment_field_instance
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
index f8ea3e2c839d..c27303e8760c 100644
--- a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
+++ b/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
@@ -28,4 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d7_comment_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migration_templates/d7_comment_field.yml
index 1cf379056f12..b4b3543db170 100644
--- a/core/modules/comment/migration_templates/d7_comment_field.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field.yml
@@ -17,4 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d7_comment_type
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment_field_instance.yml b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
index 48804bc8b4d7..80a1a5198cf0 100644
--- a/core/modules/comment/migration_templates/d7_comment_field_instance.yml
+++ b/core/modules/comment/migration_templates/d7_comment_field_instance.yml
@@ -25,4 +25,3 @@ destination:
 migration_dependencies:
   required:
     - d7_comment_field
-provider: migrate_drupal
diff --git a/core/modules/comment/migration_templates/d7_comment_type.yml b/core/modules/comment/migration_templates/d7_comment_type.yml
index 5638ee1622d3..090bfdde2940 100644
--- a/core/modules/comment/migration_templates/d7_comment_type.yml
+++ b/core/modules/comment/migration_templates/d7_comment_type.yml
@@ -15,4 +15,3 @@ destination:
 migration_dependencies:
   required:
     - d7_node_type
-provider: migrate_drupal
diff --git a/core/modules/contact/migration_templates/contact_category.yml b/core/modules/contact/migration_templates/contact_category.yml
index e91e519cd440..ce7ce9931df8 100644
--- a/core/modules/contact/migration_templates/contact_category.yml
+++ b/core/modules/contact/migration_templates/contact_category.yml
@@ -21,4 +21,3 @@ process:
   weight: weight
 destination:
   plugin: entity:contact_form
-provider: migrate_drupal
diff --git a/core/modules/contact/migration_templates/d6_contact_settings.yml b/core/modules/contact/migration_templates/d6_contact_settings.yml
index 7cebbf3b7905..452ebb236416 100644
--- a/core/modules/contact/migration_templates/d6_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d6_contact_settings.yml
@@ -20,4 +20,3 @@ destination:
 migration_dependencies:
   required:
     - contact_category
-provider: migrate_drupal
diff --git a/core/modules/contact/migration_templates/d7_contact_settings.yml b/core/modules/contact/migration_templates/d7_contact_settings.yml
index e8474391eca5..a0f3a3b51a40 100644
--- a/core/modules/contact/migration_templates/d7_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d7_contact_settings.yml
@@ -26,4 +26,3 @@ dependencies:
   module:
     - contact
     - migrate_drupal
-provider: migrate_drupal
diff --git a/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
index 875551887667..64da0a7d1374 100644
--- a/core/modules/dblog/migration_templates/d6_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: dblog.settings
-provider: migrate_drupal
diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
index c0d46aec5e63..e22768fe4683 100644
--- a/core/modules/dblog/migration_templates/d7_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: dblog.settings
-provider: migrate_drupal
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index 2a45e5c7e226..531bc132d1ef 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -129,4 +129,3 @@ process:
 
 destination:
   plugin: md_entity:field_storage_config
-provider: migrate_drupal
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 84fd4a10dae6..7496db393174 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -262,4 +262,3 @@ migration_dependencies:
   required:
     - d6_field_instance
     - d6_view_modes
-provider: migrate_drupal
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index 672d6577e462..b5035c2a579b 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -59,4 +59,3 @@ migration_dependencies:
   required:
     - d6_node_type
     - d6_field
-provider: migrate_drupal
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 d8e786b003b5..46b7d75989b2 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
@@ -67,4 +67,3 @@ destination:
 migration_dependencies:
   required:
     - d6_field_instance
-provider: migrate_drupal
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml
index 378beb052bc7..18135affbb54 100644
--- a/core/modules/field/migration_templates/d7_field.yml
+++ b/core/modules/field/migration_templates/d7_field.yml
@@ -40,4 +40,3 @@ process:
     plugin: d7_field_settings
 destination:
   plugin: entity:field_storage_config
-provider: migrate_drupal
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 3d1b23814c4d..ee07ec4be06f 100644
--- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml
@@ -75,4 +75,3 @@ migration_dependencies:
   required:
     - d7_field_instance
     - d7_view_modes
-provider: migrate_drupal
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index 49e504a82321..b6d2497e5348 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -35,4 +35,3 @@ migration_dependencies:
   optional:
     - d7_node_type
     - d7_comment_type
-provider: migrate_drupal
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 b98d0bcf9ca0..f88f2d2057c9 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
@@ -58,4 +58,3 @@ destination:
 migration_dependencies:
   required:
     - d7_field_instance
-provider: migrate_drupal
diff --git a/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migration_templates/d7_view_modes.yml
index 8275a6adf650..b4f99989566c 100644
--- a/core/modules/field/migration_templates/d7_view_modes.yml
+++ b/core/modules/field/migration_templates/d7_view_modes.yml
@@ -25,4 +25,3 @@ process:
   targetEntityType: entity_type
 destination:
   plugin: entity:entity_view_mode
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
index 5c5bd2c7a4d9..a4693cf1120a 100644
--- a/core/modules/file/migration_templates/d6_file.yml
+++ b/core/modules/file/migration_templates/d6_file.yml
@@ -24,4 +24,3 @@ process:
 destination:
   plugin: entity:file
   urlencode: true
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_file_settings.yml b/core/modules/file/migration_templates/d6_file_settings.yml
index dd53adce5cdb..d59aa47529c8 100644
--- a/core/modules/file/migration_templates/d6_file_settings.yml
+++ b/core/modules/file/migration_templates/d6_file_settings.yml
@@ -15,4 +15,3 @@ process:
 destination:
   plugin: config
   config_name: file.settings
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_upload.yml b/core/modules/file/migration_templates/d6_upload.yml
index 24ddde233739..75164a89972d 100644
--- a/core/modules/file/migration_templates/d6_upload.yml
+++ b/core/modules/file/migration_templates/d6_upload.yml
@@ -25,4 +25,3 @@ migration_dependencies:
     - d6_file
     - d6_node
     - d6_upload_field_instance
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_upload_entity_display.yml b/core/modules/file/migration_templates/d6_upload_entity_display.yml
index 49bbd7c772bd..b097c88af429 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_display.yml
@@ -25,4 +25,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
index 4bb5e00caa40..75436db76129 100644
--- a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
+++ b/core/modules/file/migration_templates/d6_upload_entity_form_display.yml
@@ -26,4 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml
index 1caa24e371db..c0b4569a699c 100644
--- a/core/modules/file/migration_templates/d6_upload_field.yml
+++ b/core/modules/file/migration_templates/d6_upload_field.yml
@@ -21,4 +21,3 @@ process:
   'settings/display_field': 'constants/display_field'
 destination:
   plugin: md_entity:field_storage_config
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d6_upload_field_instance.yml b/core/modules/file/migration_templates/d6_upload_field_instance.yml
index 59a8adfcc23f..5bd7c9a2c589 100644
--- a/core/modules/file/migration_templates/d6_upload_field_instance.yml
+++ b/core/modules/file/migration_templates/d6_upload_field_instance.yml
@@ -29,4 +29,3 @@ migration_dependencies:
   required:
     - d6_upload_field
     - d6_node_type
-provider: migrate_drupal
diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml
index cf705e74dd9e..b10cca614407 100644
--- a/core/modules/file/migration_templates/d7_file.yml
+++ b/core/modules/file/migration_templates/d7_file.yml
@@ -24,4 +24,3 @@ destination:
   plugin: entity:file
   source_path_property: filepath
   urlencode: true
-provider: migrate_drupal
diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
index 5be7d31b74ca..6b767f208b14 100644
--- a/core/modules/filter/migration_templates/d6_filter_format.yml
+++ b/core/modules/filter/migration_templates/d6_filter_format.yml
@@ -37,4 +37,3 @@ process:
 destination:
   plugin: entity:filter_format
   no_stub: true
-provider: migrate_drupal
diff --git a/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml
index 270e44c012be..2b44a80c0919 100644
--- a/core/modules/filter/migration_templates/d7_filter_format.yml
+++ b/core/modules/filter/migration_templates/d7_filter_format.yml
@@ -29,4 +29,3 @@ process:
       weight: weight
 destination:
   plugin: entity:filter_format
-provider: migrate_drupal
diff --git a/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml
index e3d4efcbdf3e..5516848e42a2 100644
--- a/core/modules/forum/migration_templates/d6_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d6_forum_settings.yml
@@ -27,4 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/forum/migration_templates/d7_forum_settings.yml b/core/modules/forum/migration_templates/d7_forum_settings.yml
index 6e31062abc64..b84d48598996 100644
--- a/core/modules/forum/migration_templates/d7_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d7_forum_settings.yml
@@ -27,4 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d7_taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/image/migration_templates/d6_imagecache_presets.yml b/core/modules/image/migration_templates/d6_imagecache_presets.yml
index 4816cf8489ef..e4780a9147d5 100644
--- a/core/modules/image/migration_templates/d6_imagecache_presets.yml
+++ b/core/modules/image/migration_templates/d6_imagecache_presets.yml
@@ -22,4 +22,3 @@ process:
       - data
 destination:
   plugin: entity:image_style
-provider: migrate_drupal
diff --git a/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migration_templates/d7_image_settings.yml
index 7b66f7f82528..bfae4d5bb5ec 100644
--- a/core/modules/image/migration_templates/d7_image_settings.yml
+++ b/core/modules/image/migration_templates/d7_image_settings.yml
@@ -15,4 +15,3 @@ process:
 destination:
   plugin: config
   config_name: image.settings
-provider: migrate_drupal
diff --git a/core/modules/image/migration_templates/d7_image_styles.yml b/core/modules/image/migration_templates/d7_image_styles.yml
index fb74676d16ea..7dd89775d278 100644
--- a/core/modules/image/migration_templates/d7_image_styles.yml
+++ b/core/modules/image/migration_templates/d7_image_styles.yml
@@ -16,4 +16,3 @@ process:
       data: data
 destination:
   plugin: entity:image_style
-provider: migrate_drupal
diff --git a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
index 1cc27fc0285b..f03be789e82e 100644
--- a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
+++ b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml
@@ -13,4 +13,3 @@ process:
 destination:
   plugin: config
   config_name: language.negotiation
-provider: migrate_drupal
diff --git a/core/modules/language/migration_templates/language.yml b/core/modules/language/migration_templates/language.yml
index 592f5fc2b434..6ca9c6d54d09 100644
--- a/core/modules/language/migration_templates/language.yml
+++ b/core/modules/language/migration_templates/language.yml
@@ -17,4 +17,3 @@ process:
   weight: weight
 destination:
   plugin: entity:configurable_language
-provider: migrate_drupal
diff --git a/core/modules/locale/migration_templates/locale_settings.yml b/core/modules/locale/migration_templates/locale_settings.yml
index e14db70e6495..6eebe20455b3 100644
--- a/core/modules/locale/migration_templates/locale_settings.yml
+++ b/core/modules/locale/migration_templates/locale_settings.yml
@@ -14,4 +14,3 @@ process:
 destination:
   plugin: config
   config_name: locale.settings
-provider: migrate_drupal
diff --git a/core/modules/menu_link_content/migration_templates/menu_links.yml b/core/modules/menu_link_content/migration_templates/menu_links.yml
index 8f825af3254e..b70314a39f6f 100644
--- a/core/modules/menu_link_content/migration_templates/menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/menu_links.yml
@@ -51,4 +51,3 @@ destination:
 migration_dependencies:
   required:
     - menu
-provider: migrate_drupal
diff --git a/core/modules/menu_ui/migration_templates/menu_settings.yml b/core/modules/menu_ui/migration_templates/menu_settings.yml
index db3fb4e5536e..b59cbc2c601b 100644
--- a/core/modules/menu_ui/migration_templates/menu_settings.yml
+++ b/core/modules/menu_ui/migration_templates/menu_settings.yml
@@ -12,4 +12,3 @@ process:
 destination:
   plugin: config
   config_name: menu_ui.settings
-provider: migrate_drupal
diff --git a/core/modules/migrate/src/Plugin/Discovery/MigrateContainerDerivativeDiscoveryDecorator.php b/core/modules/migrate/src/Plugin/Discovery/MigrateContainerDerivativeDiscoveryDecorator.php
deleted file mode 100644
index 8fe42f700a95..000000000000
--- a/core/modules/migrate/src/Plugin/Discovery/MigrateContainerDerivativeDiscoveryDecorator.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\migrate\Plugin\Discovery;
-
-use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
-
-/**
- * Overrides ContainerDerivativeDiscoveryDecorator to pre-check providers.
- *
- * @ingroup migration
- */
-class MigrateContainerDerivativeDiscoveryDecorator extends ContainerDerivativeDiscoveryDecorator {
-
-  /**
-   * The module handler to invoke the alter hook.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Constructs a new MigrateContainerDerivativeDiscoveryDecorator.
-   *
-   * @param \Drupal\Component\Plugin\Discovery\DiscoveryInterface $decorated
-   *   The parent object that is being decorated.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   */
-  public function __construct(DiscoveryInterface $decorated, ModuleHandlerInterface $module_handler) {
-    parent::__construct($decorated);
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getDeriver($base_plugin_id, $base_definition) {
-    // Short-circuit attempts to instantiate derivers if the base provider is
-    // not available.
-    if (isset($base_definition['provider']) && !in_array($base_definition['provider'], ['core', 'component']) && !$this->moduleHandler->moduleExists($base_definition['provider'])) {
-      return NULL;
-    }
-    else {
-      return parent::getDeriver($base_plugin_id, $base_definition);
-    }
-  }
-
-}
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
index 744ee2b61492..d082c11d765e 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManager.php
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
@@ -8,10 +8,10 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
 use Drupal\Core\Plugin\Discovery\YamlDirectoryDiscovery;
 use Drupal\Core\Plugin\Factory\ContainerFactory;
 use Drupal\migrate\MigrateBuildDependencyInterface;
-use Drupal\migrate\Plugin\Discovery\MigrateContainerDerivativeDiscoveryDecorator;
 
 /**
  * Plugin manager for migration plugins.
@@ -68,7 +68,7 @@ protected function getDiscovery() {
       }, $this->moduleHandler->getModuleDirectories());
 
       $yaml_discovery = new YamlDirectoryDiscovery($directories, 'migrate');
-      $this->discovery = new MigrateContainerDerivativeDiscoveryDecorator($yaml_discovery, $this->moduleHandler);
+      $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml_discovery);
     }
     return $this->discovery;
   }
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
deleted file mode 100644
index 75718cc60537..000000000000
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\Tests\migrate\Kernel\Plugin;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests the migration manager plugin.
- *
- * @coversDefaultClass \Drupal\migrate\Plugin\MigratePluginManager
- * @group migrate
- */
-class MigrationPluginListTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'migrate',
-    // Test with all modules containing Drupal migrations.
-    'action',
-    'aggregator',
-    'ban',
-    'block',
-    'block_content',
-    'book',
-    'comment',
-    'contact',
-    'dblog',
-    'field',
-    'file',
-    'filter',
-    'forum',
-    'image',
-    'language',
-    'locale',
-    'menu_link_content',
-    'menu_ui',
-    'node',
-    'path',
-    'search',
-    'shortcut',
-    'simpletest',
-    'statistics',
-    'syslog',
-    'system',
-    'taxonomy',
-    'text',
-    'tracker',
-    'update',
-    'user',
-  ];
-
-  /**
-   * Tests MigratePluginManager::getDefinitions()
-   *
-   * @covers ::getDefinitions
-   */
-  public function testGetDefinitions() {
-    // Make sure retrieving all the core migration plugins does not throw any
-    // errors.
-    $migration_plugins = $this->container->get('plugin.manager.migration')->getDefinitions();
-  }
-
-}
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migration_templates/users.yml b/core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migration_templates/users.yml
index 7335e673f29b..e23d90d9d7c2 100644
--- a/core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migration_templates/users.yml
+++ b/core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migration_templates/users.yml
@@ -29,4 +29,3 @@ destination:
     - mail
     # It's possible to overwrite nested properties too.
     - 'signature/value'
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
index f87e666b495b..58aea356d682 100644
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -50,4 +50,3 @@ migration_dependencies:
     - d6_field_instance_widget_settings
     - d6_field_formatter_settings
     - d6_upload_field_instance
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
index 1145a0b4bc76..b7826a18b3d6 100644
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -37,4 +37,3 @@ process:
 
 destination:
   plugin: entity_revision:node
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node_setting_promote.yml b/core/modules/node/migration_templates/d6_node_setting_promote.yml
index 9683f0ba50c7..469083dc26b9 100644
--- a/core/modules/node/migration_templates/d6_node_setting_promote.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_promote.yml
@@ -20,4 +20,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node_setting_status.yml b/core/modules/node/migration_templates/d6_node_setting_status.yml
index 3c681a633ae8..e1ea6473f8ca 100644
--- a/core/modules/node/migration_templates/d6_node_setting_status.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_status.yml
@@ -17,4 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node_setting_sticky.yml b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
index bfb170b81e4d..77ad6cd9b819 100644
--- a/core/modules/node/migration_templates/d6_node_setting_sticky.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
@@ -20,4 +20,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml
index c9654678ea7d..17b08573f550 100644
--- a/core/modules/node/migration_templates/d6_node_settings.yml
+++ b/core/modules/node/migration_templates/d6_node_settings.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: node.settings
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_node_type.yml b/core/modules/node/migration_templates/d6_node_type.yml
index cfce484ff8aa..4c76f66a94c9 100644
--- a/core/modules/node/migration_templates/d6_node_type.yml
+++ b/core/modules/node/migration_templates/d6_node_type.yml
@@ -22,4 +22,3 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d6_view_modes.yml b/core/modules/node/migration_templates/d6_view_modes.yml
index d33413796992..815709b14d66 100644
--- a/core/modules/node/migration_templates/d6_view_modes.yml
+++ b/core/modules/node/migration_templates/d6_view_modes.yml
@@ -36,4 +36,3 @@ process:
   status: 'constants/status'
 destination:
   plugin: entity:entity_view_mode
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migration_templates/d7_node.yml
index 6982c0b78036..b763534dd19f 100644
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -30,4 +30,3 @@ migration_dependencies:
     - d7_node_type
   optional:
     - d7_field_instance
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml
index c5c0a959b28b..0ee8bca6e52d 100644
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -27,4 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d7_node
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d7_node_settings.yml b/core/modules/node/migration_templates/d7_node_settings.yml
index 47897179901f..04617544c9dd 100644
--- a/core/modules/node/migration_templates/d7_node_settings.yml
+++ b/core/modules/node/migration_templates/d7_node_settings.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: node.settings
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d7_node_title_label.yml b/core/modules/node/migration_templates/d7_node_title_label.yml
index e744e83c21d2..53ae6ea3350b 100644
--- a/core/modules/node/migration_templates/d7_node_title_label.yml
+++ b/core/modules/node/migration_templates/d7_node_title_label.yml
@@ -17,4 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d7_node_type
-provider: migrate_drupal
diff --git a/core/modules/node/migration_templates/d7_node_type.yml b/core/modules/node/migration_templates/d7_node_type.yml
index 0e989d2ea527..6cf8e783fb36 100644
--- a/core/modules/node/migration_templates/d7_node_type.yml
+++ b/core/modules/node/migration_templates/d7_node_type.yml
@@ -19,4 +19,3 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-provider: migrate_drupal
diff --git a/core/modules/path/migration_templates/d6_url_alias.yml b/core/modules/path/migration_templates/d6_url_alias.yml
index 15217ecd3aff..4ca48fed9e14 100644
--- a/core/modules/path/migration_templates/d6_url_alias.yml
+++ b/core/modules/path/migration_templates/d6_url_alias.yml
@@ -22,4 +22,3 @@ process:
     source: language
 destination:
   plugin: url_alias
-provider: migrate_drupal
diff --git a/core/modules/path/migration_templates/d7_url_alias.yml b/core/modules/path/migration_templates/d7_url_alias.yml
index 9117384f84de..a3ddec1ad0f4 100644
--- a/core/modules/path/migration_templates/d7_url_alias.yml
+++ b/core/modules/path/migration_templates/d7_url_alias.yml
@@ -20,4 +20,3 @@ process:
   langcode: language
 destination:
   plugin: url_alias
-provider: migrate_drupal
diff --git a/core/modules/search/migration_templates/d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml
index 7c940765d59e..8efb9fdb1565 100644
--- a/core/modules/search/migration_templates/d6_search_settings.yml
+++ b/core/modules/search/migration_templates/d6_search_settings.yml
@@ -20,4 +20,3 @@ process:
 destination:
   plugin: config
   config_name: search.settings
-provider: migrate_drupal
diff --git a/core/modules/search/migration_templates/d7_search_settings.yml b/core/modules/search/migration_templates/d7_search_settings.yml
index dfcc84131698..57db8b945660 100644
--- a/core/modules/search/migration_templates/d7_search_settings.yml
+++ b/core/modules/search/migration_templates/d7_search_settings.yml
@@ -30,4 +30,3 @@ process:
 destination:
   plugin: config
   config_name: search.settings
-provider: migrate_drupal
diff --git a/core/modules/search/migration_templates/search_page.yml b/core/modules/search/migration_templates/search_page.yml
index 5a9801116cdd..8ddc02acfbca 100644
--- a/core/modules/search/migration_templates/search_page.yml
+++ b/core/modules/search/migration_templates/search_page.yml
@@ -24,4 +24,3 @@ process:
     plugin: search_configuration_rankings
 destination:
   plugin: entity:search_page
-provider: migrate_drupal
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut.yml b/core/modules/shortcut/migration_templates/d7_shortcut.yml
index 25c5bd891eaf..ba986eb85300 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut.yml
@@ -24,4 +24,3 @@ migration_dependencies:
   required:
     - d7_shortcut_set
     - menu_links
-provider: migrate_drupal
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut_set.yml b/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
index 40cc2fe5fe80..784178e86269 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut_set.yml
@@ -18,4 +18,3 @@ process:
   label: title
 destination:
   plugin: entity:shortcut_set
-provider: migrate_drupal
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml b/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
index 319a4cd34845..a93c4bbab0ca 100644
--- a/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
+++ b/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
@@ -23,4 +23,3 @@ migration_dependencies:
   required:
     - d7_shortcut_set
     - d7_user
-provider: migrate_drupal
diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
index 952b4ebb84cd..c9eedbb265e1 100644
--- a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
@@ -19,4 +19,3 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
-provider: migrate_drupal
diff --git a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
index 9899f18918e1..b77f76a3291c 100644
--- a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
@@ -19,4 +19,3 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
-provider: migrate_drupal
diff --git a/core/modules/statistics/migration_templates/d6_statistics_settings.yml b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
index 8d601fb9a549..348ad38e4fc4 100644
--- a/core/modules/statistics/migration_templates/d6_statistics_settings.yml
+++ b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
@@ -15,4 +15,3 @@ process:
 destination:
   plugin: config
   config_name: statistics.settings
-provider: migrate_drupal
diff --git a/core/modules/syslog/migration_templates/d6_syslog_settings.yml b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
index 978b83f5eddd..86a7017d003d 100644
--- a/core/modules/syslog/migration_templates/d6_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
@@ -13,4 +13,3 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
-provider: migrate_drupal
diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
index 4c6ae993e5b0..40005722261b 100644
--- a/core/modules/syslog/migration_templates/d7_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
@@ -15,4 +15,3 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml
index 54dbcb991088..71257d4fc53f 100644
--- a/core/modules/system/migration_templates/d6_date_formats.yml
+++ b/core/modules/system/migration_templates/d6_date_formats.yml
@@ -19,4 +19,3 @@ process:
   pattern: value
 destination:
   plugin: entity:date_format
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml
index b7cff5fe1003..7dd3a2bcec57 100644
--- a/core/modules/system/migration_templates/d6_system_cron.yml
+++ b/core/modules/system/migration_templates/d6_system_cron.yml
@@ -14,4 +14,3 @@ process:
 destination:
   plugin: config
   config_name: system.cron
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_date.yml b/core/modules/system/migration_templates/d6_system_date.yml
index 0156b6e31943..25f6728ae1e3 100644
--- a/core/modules/system/migration_templates/d6_system_date.yml
+++ b/core/modules/system/migration_templates/d6_system_date.yml
@@ -17,4 +17,3 @@ process:
 destination:
   plugin: config
   config_name: system.date
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml
index b11a3fd0e59f..60cd61600b7b 100644
--- a/core/modules/system/migration_templates/d6_system_file.yml
+++ b/core/modules/system/migration_templates/d6_system_file.yml
@@ -18,4 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.file
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_image.yml b/core/modules/system/migration_templates/d6_system_image.yml
index a9243685c60c..15d0ecc31bcc 100644
--- a/core/modules/system/migration_templates/d6_system_image.yml
+++ b/core/modules/system/migration_templates/d6_system_image.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_image_gd.yml b/core/modules/system/migration_templates/d6_system_image_gd.yml
index b467095507ea..543b1628474c 100644
--- a/core/modules/system/migration_templates/d6_system_image_gd.yml
+++ b/core/modules/system/migration_templates/d6_system_image_gd.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image.gd
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_logging.yml b/core/modules/system/migration_templates/d6_system_logging.yml
index f88ccfb54a6c..868d08fb4a4e 100644
--- a/core/modules/system/migration_templates/d6_system_logging.yml
+++ b/core/modules/system/migration_templates/d6_system_logging.yml
@@ -19,4 +19,3 @@ process:
 destination:
   plugin: config
   config_name: system.logging
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_maintenance.yml b/core/modules/system/migration_templates/d6_system_maintenance.yml
index 762820929430..9f9f0308339f 100644
--- a/core/modules/system/migration_templates/d6_system_maintenance.yml
+++ b/core/modules/system/migration_templates/d6_system_maintenance.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.maintenance
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml
index d88551c5f5ed..6f9666e42c9a 100644
--- a/core/modules/system/migration_templates/d6_system_performance.yml
+++ b/core/modules/system/migration_templates/d6_system_performance.yml
@@ -18,4 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.performance
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml
index 77fb3c089a6d..d112e82653b6 100644
--- a/core/modules/system/migration_templates/d6_system_rss.yml
+++ b/core/modules/system/migration_templates/d6_system_rss.yml
@@ -13,4 +13,3 @@ process:
 destination:
   plugin: config
   config_name: system.rss
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/d6_system_site.yml b/core/modules/system/migration_templates/d6_system_site.yml
index 0a18a61a9da3..9e16219c27ff 100644
--- a/core/modules/system/migration_templates/d6_system_site.yml
+++ b/core/modules/system/migration_templates/d6_system_site.yml
@@ -39,4 +39,3 @@ process:
 destination:
   plugin: config
   config_name: system.site
-provider: migrate_drupal
diff --git a/core/modules/system/migration_templates/menu.yml b/core/modules/system/migration_templates/menu.yml
index 796da5d374d5..542faa46e078 100644
--- a/core/modules/system/migration_templates/menu.yml
+++ b/core/modules/system/migration_templates/menu.yml
@@ -11,4 +11,3 @@ process:
   description: description
 destination:
   plugin: entity:menu
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index 95aba8e55b86..44f9f7fb6f9d 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -32,4 +32,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 5e564957435c..654a07640bf3 100644
--- a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -21,4 +21,3 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node.yml b/core/modules/taxonomy/migration_templates/d6_term_node.yml
index 34175faeb234..63aec8563f5d 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node.yml
@@ -23,4 +23,3 @@ migration_dependencies:
     - d6_vocabulary_entity_display
     - d6_vocabulary_entity_form_display
     - d6_node
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
index 3b7f53167ebf..cf1c6829040a 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -22,4 +22,3 @@ migration_dependencies:
   required:
     - d6_term_node
     - d6_node_revision
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
index 92300b5a8726..e8d04c0c6f7b 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -25,4 +25,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
index f25b0b3ce6e8..2608877e9d5e 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
@@ -29,4 +29,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index 1d0e56ff4dbc..a1c97356f04d 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -26,4 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
index 79d098caa6c0..a7bbbbbc42cc 100644
--- a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -30,4 +30,3 @@ migration_dependencies:
   required:
     - d6_node_type
     - d6_vocabulary_field
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
index e306ad324347..8d4adbbed668 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
@@ -33,4 +33,3 @@ destination:
 migration_dependencies:
   required:
     - d7_taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
index 743f9c2748be..80c38a79fa4c 100644
--- a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
@@ -13,4 +13,3 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-provider: migrate_drupal
diff --git a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
index cf4c0209c588..c20372c690a5 100644
--- a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
+++ b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml
@@ -14,4 +14,3 @@ process:
 destination:
   plugin: config
   config_name: taxonomy.settings
-provider: migrate_drupal
diff --git a/core/modules/text/migration_templates/text_settings.yml b/core/modules/text/migration_templates/text_settings.yml
index 8924a5c8b02b..45d426da3532 100644
--- a/core/modules/text/migration_templates/text_settings.yml
+++ b/core/modules/text/migration_templates/text_settings.yml
@@ -12,4 +12,3 @@ process:
 destination:
   plugin: config
   config_name: text.settings
-provider: migrate_drupal
diff --git a/core/modules/tracker/migration_templates/d7_tracker_node.yml b/core/modules/tracker/migration_templates/d7_tracker_node.yml
index ed8ac68cddb0..02645d7e8a81 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_node.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_node.yml
@@ -13,4 +13,3 @@ destination:
 migration_dependencies:
   required:
     - d7_user
-provider: migrate_drupal
diff --git a/core/modules/tracker/migration_templates/d7_tracker_settings.yml b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
index 30692f454443..ce06cbd84a8a 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_settings.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_settings.yml
@@ -11,4 +11,3 @@ process:
 destination:
   plugin: config
   config_name: tracker.settings
-provider: migrate_drupal
diff --git a/core/modules/tracker/migration_templates/d7_tracker_user.yml b/core/modules/tracker/migration_templates/d7_tracker_user.yml
index 12fc9eb8b355..ae3c51d69e0e 100644
--- a/core/modules/tracker/migration_templates/d7_tracker_user.yml
+++ b/core/modules/tracker/migration_templates/d7_tracker_user.yml
@@ -14,4 +14,3 @@ destination:
 migration_dependencies:
   required:
     - d7_user
-provider: migrate_drupal
diff --git a/core/modules/update/migration_templates/update_settings.yml b/core/modules/update/migration_templates/update_settings.yml
index 3acc764bdc77..ad2247235594 100644
--- a/core/modules/update/migration_templates/update_settings.yml
+++ b/core/modules/update/migration_templates/update_settings.yml
@@ -20,4 +20,3 @@ process:
 destination:
   plugin: config
   config_name: update.settings
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_profile_values.yml b/core/modules/user/migration_templates/d6_profile_values.yml
index fd603b237bb3..7d4fbdd5560a 100644
--- a/core/modules/user/migration_templates/d6_profile_values.yml
+++ b/core/modules/user/migration_templates/d6_profile_values.yml
@@ -19,4 +19,3 @@ migration_dependencies:
     - user_profile_field_instance
     - user_profile_entity_display
     - user_profile_entity_form_display
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index 3c8a0248c236..bf6ec2aded2e 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -37,4 +37,3 @@ migration_dependencies:
     - d6_user_picture_file
     - user_picture_entity_display
     - user_picture_entity_form_display
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_user_contact_settings.yml b/core/modules/user/migration_templates/d6_user_contact_settings.yml
index 6d88856b585d..0d9a2289a608 100644
--- a/core/modules/user/migration_templates/d6_user_contact_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_contact_settings.yml
@@ -21,4 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_user_mail.yml b/core/modules/user/migration_templates/d6_user_mail.yml
index 3eab24473007..b06b6ea214eb 100644
--- a/core/modules/user/migration_templates/d6_user_mail.yml
+++ b/core/modules/user/migration_templates/d6_user_mail.yml
@@ -65,4 +65,3 @@ process:
 destination:
   plugin: config
   config_name: user.mail
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_user_picture_file.yml b/core/modules/user/migration_templates/d6_user_picture_file.yml
index 0f4e513beba0..e4d572ac614b 100644
--- a/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ b/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -24,4 +24,3 @@ migration_dependencies:
   # migration as an optional dependency to ensure it runs first.
   optional:
     - d6_file
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_user_role.yml b/core/modules/user/migration_templates/d6_user_role.yml
index 87e539ace0e2..a97d5194fd01 100644
--- a/core/modules/user/migration_templates/d6_user_role.yml
+++ b/core/modules/user/migration_templates/d6_user_role.yml
@@ -44,4 +44,3 @@ destination:
 migration_dependencies:
   required:
     - d6_filter_format
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d6_user_settings.yml b/core/modules/user/migration_templates/d6_user_settings.yml
index d421822633da..6e25ece3761f 100644
--- a/core/modules/user/migration_templates/d6_user_settings.yml
+++ b/core/modules/user/migration_templates/d6_user_settings.yml
@@ -26,4 +26,3 @@ process:
 destination:
   plugin: config
   config_name: user.settings
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
index f396cfb7935d..12147f8fcd2e 100644
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -41,4 +41,3 @@ migration_dependencies:
     - user_picture_field_instance
     - user_picture_entity_display
     - user_picture_entity_form_display
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migration_templates/d7_user_flood.yml
index cb702bcbfe69..ae00ce08cf2d 100644
--- a/core/modules/user/migration_templates/d7_user_flood.yml
+++ b/core/modules/user/migration_templates/d7_user_flood.yml
@@ -19,4 +19,3 @@ process:
 destination:
   plugin: config
   config_name: user.flood
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d7_user_mail.yml b/core/modules/user/migration_templates/d7_user_mail.yml
index b6ca7408e022..0c5e74c32bfb 100644
--- a/core/modules/user/migration_templates/d7_user_mail.yml
+++ b/core/modules/user/migration_templates/d7_user_mail.yml
@@ -37,4 +37,3 @@ process:
 destination:
   plugin: config
   config_name: user.mail
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml
index 647748427f0b..68c0d1168e03 100644
--- a/core/modules/user/migration_templates/d7_user_role.yml
+++ b/core/modules/user/migration_templates/d7_user_role.yml
@@ -42,4 +42,3 @@ destination:
 migration_dependencies:
   optional:
     - d7_filter_format
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_picture_entity_display.yml b/core/modules/user/migration_templates/user_picture_entity_display.yml
index de52db43b0fe..3f404d6f5727 100644
--- a/core/modules/user/migration_templates/user_picture_entity_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_display.yml
@@ -29,4 +29,3 @@ destination:
 migration_dependencies:
   required:
     - user_picture_field_instance
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_picture_entity_form_display.yml b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
index 5a9b5f4012e8..4d0f8bc61617 100644
--- a/core/modules/user/migration_templates/user_picture_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_picture_entity_form_display.yml
@@ -28,4 +28,3 @@ destination:
 migration_dependencies:
   required:
     - user_picture_field_instance
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml
index 5b8d716f43df..a484ab8d1cf2 100644
--- a/core/modules/user/migration_templates/user_picture_field.yml
+++ b/core/modules/user/migration_templates/user_picture_field.yml
@@ -19,4 +19,3 @@ process:
   cardinality: 'constants/cardinality'
 destination:
   plugin: md_entity:field_storage_config
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_picture_field_instance.yml b/core/modules/user/migration_templates/user_picture_field_instance.yml
index 56a0b2196294..4332e09e5001 100644
--- a/core/modules/user/migration_templates/user_picture_field_instance.yml
+++ b/core/modules/user/migration_templates/user_picture_field_instance.yml
@@ -29,4 +29,3 @@ destination:
 migration_dependencies:
   required:
     - user_picture_field
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_profile_entity_display.yml b/core/modules/user/migration_templates/user_profile_entity_display.yml
index fe88c429215f..f4353ddda3ee 100644
--- a/core/modules/user/migration_templates/user_profile_entity_display.yml
+++ b/core/modules/user/migration_templates/user_profile_entity_display.yml
@@ -42,4 +42,3 @@ destination:
 migration_dependencies:
   required:
     - user_profile_field_instance
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_profile_entity_form_display.yml b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
index 3b7421fa9bce..cfabd7631271 100644
--- a/core/modules/user/migration_templates/user_profile_entity_form_display.yml
+++ b/core/modules/user/migration_templates/user_profile_entity_form_display.yml
@@ -51,4 +51,3 @@ destination:
 migration_dependencies:
   required:
     - user_profile_field_instance
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_profile_field.yml b/core/modules/user/migration_templates/user_profile_field.yml
index 8dfd79b7c4db..bf81898220fb 100644
--- a/core/modules/user/migration_templates/user_profile_field.yml
+++ b/core/modules/user/migration_templates/user_profile_field.yml
@@ -33,4 +33,3 @@ process:
       list: -1
 destination:
   plugin: md_entity:field_storage_config
-provider: migrate_drupal
diff --git a/core/modules/user/migration_templates/user_profile_field_instance.yml b/core/modules/user/migration_templates/user_profile_field_instance.yml
index f3adff3c719a..b9f213b392b5 100644
--- a/core/modules/user/migration_templates/user_profile_field_instance.yml
+++ b/core/modules/user/migration_templates/user_profile_field_instance.yml
@@ -20,4 +20,3 @@ destination:
 migration_dependencies:
   required:
     - user_profile_field
-provider: migrate_drupal
-- 
GitLab