diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
index b3d4fa8..9bcbb48 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
@@ -15,7 +15,7 @@
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\SourceEntityInterface;
 use Drupal\migrate_drupal\Plugin\MigrateLoadInterface;
-use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for entity load plugins.
@@ -85,7 +85,7 @@ public function loadMultiple(EntityStorageInterface $storage, array $sub_ids = N
         $migration->getSourcePlugin()->checkRequirements();
         $fields = array_keys($migration->getSourcePlugin()->fields());
         $migration->process += array_combine($fields, $fields);
-        $this->processProcess($migration->process, $id);
+        $this->processProcess($migration->process);
         $migrations[$migration->id()] = $migration;
       }
       catch (RequirementsException $e) {
@@ -101,14 +101,12 @@ public function loadMultiple(EntityStorageInterface $storage, array $sub_ids = N
    *
    * @param array $process
    *   The process array for a migration.
-   * @param string $bundle
-   *   The node bundle.
    */
-  protected function processProcess(&$process, $bundle) {
+  protected function processProcess(&$process) {
     foreach ($process as $field_name => $mapping) {
       // Specifically process the link field until core is fixed.
       // @see https://www.drupal.org/node/2235457
-      if (($field = FieldConfig::loadByName('node', $bundle, $field_name)) && $field->getType() === 'link') {
+      if (($field = FieldStorageConfig::loadByName('node', $field_name)) && $field->getType() === 'link') {
         $process[$field_name] = [
           'plugin' => 'd6_cck_link',
           'source' => [
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php
index 1978c92..56bddec 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php
@@ -8,12 +8,9 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\Plugin\MigratePluginManager;
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\process\Route;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @MigrateProcessPlugin(