diff -u b/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
--- b/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Config\Context\FreeConfigContext;
+use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Lock\LockBackendInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -72,9 +72,9 @@
   /**
    * The plugin manager for entities.
    *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   * @var \Drupal\Core\Entity\EntityManager
    */
-  protected $pluginManager;
+  protected $entityManager;
 
   /**
    * The used lock backend instance.
@@ -110,17 +110,17 @@
    *   The event dispatcher used to notify subscribers of config import events.
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The config factory that statically caches config objects.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $entity_manager
-   *   The entity plugin manager used to import config entities.
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The entity manager used to import config entities.
    * @param \Drupal\Core\Lock\LockBackendInterface
    *   The lock backend to ensure multiple imports do not occur at the same time.
    */
-  public function __construct($service_name, StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, PluginManagerInterface $plugin_manager, LockBackendInterface $lock) {
+  public function __construct($service_name, StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manager, LockBackendInterface $lock) {
     $this->serviceName = $service_name;
     $this->storageComparer = $storage_comparer;
     $this->eventDispatcher = $event_dispatcher;
     $this->configFactory = $config_factory;
-    $this->pluginManager = $plugin_manager;
+    $this->entityManager = $entity_manager;
     $this->lock = $lock;
     $this->processed = $this->storageComparer->getEmptyChangelist();
     // Use an override free context for importing so that overrides to do not
@@ -306,7 +306,7 @@
           }
 
           $method = 'import' . ucfirst($op);
-          $handled_by_module = $this->pluginManager->getStorageController($entity_type)->$method($name, $new_config, $old_config);
+          $handled_by_module = $this->entityManager->getStorageController($entity_type)->$method($name, $new_config, $old_config);
         }
         if (!empty($handled_by_module)) {
           $this->setProcessed($op, $name);
diff -u b/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
--- b/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -52,9 +52,14 @@
   protected $targetNames = array();
 
   /**
-   * {@inheritdoc}
+   * Constructs the Configuration storage comparer.
+   *
+   * @param \Drupal\Core\Config\StorageInterface $source_storage
+   *   Storage controller object used to read configuration.
+   * @param \Drupal\Core\Config\StorageInterface $target_storage
+   *   Storage controller object used to read configuration.
    */
-  public function __construct($source_storage, $target_storage) {
+  public function __construct(StorageInterface $source_storage, StorageInterface $target_storage) {
     $this->sourceStorage = $source_storage;
     $this->targetStorage = $target_storage;
     $this->changelist = $this->getEmptyChangelist();
diff -u b/core/lib/Drupal/Core/Config/StorageComparerInterface.php b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
--- b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
@@ -13,16 +13,6 @@
 interface StorageComparerInterface {
 
   /**
-   * Constructs the Configuration storage comparer.
-   *
-   * @param \Drupal\Core\Config\StorageInterface $source_storage
-   *   Storage controller object used to read configuration.
-   * @param \Drupal\Core\Config\StorageInterface $target_storage
-   *   Storage controller object used to read configuration.
-   */
-  public function __construct($source_storage, $target_storage);
-
-  /**
    * Gets the configuration source storage.
    *
    * @return \Drupal\Core\Config\StorageInterface