reverted:
--- b/core/modules/config_translation/src/Plugin/migrate/process/Substr.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\config_translation\Plugin\migrate\process;
-
-use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\MigrateExecutableInterface;
-use Drupal\migrate\Row;
-use Drupal\migrate\MigrateException;
-use Drupal\Component\Utility\Unicode;
-
-/**
- * Gets a substring.
- *
- * @MigrateProcessPlugin(
- *   id = "substr"
- * )
- */
-class Substr extends ProcessPluginBase {
-
-  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    $start = isset($this->configuration['start']) ? $this->configuration['start'] : 0;
-    if (!is_int($start)) {
-      throw new MigrateException('The start position configuration key should be an integer. Omit this key to capture from the beginning of the string.');
-    }
-    $length = isset($this->configuration['length']) ? $this->configuration['length'] : NULL;
-    if (!is_null($length) && !is_int($length)) {
-      throw new MigrateException('The character length configuration key should be an integer. Omit this key to capture the entire string.');
-    }
-    // Use optional start or length to return a portion of $value.
-    $new_value = Unicode::substr($value, $start, $length);
-    return $new_value;
-  }
-
-}
diff -u b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
--- b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -19,6 +19,12 @@
 class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
 
   /**
+   * The field type plugin manager.
+   *
+   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
+class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
+
+  /**
    * The language manager.
    *
    * @var \Drupal\Core\Language\LanguageManagerInterface
@@ -28,10 +34,4 @@
   /**
    * The field type plugin manager.
-   *
-   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
-class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
-
-  /**
-   * The field type plugin manager.
    *
    * @var \Drupal\Core\Field\FieldTypePluginManagerInterface