reverted:
--- b/core/modules/field/field.module
+++ a/core/modules/field/field.module
@@ -12,7 +12,6 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Component\Utility\SafeMarkup;
 
 /*
  * Load all public Field API functions. Drupal currently has no
@@ -281,49 +280,3 @@
     }
   }
 }
-
-/**
- * Implements hook_token_info().
- */
-function field_token_info() {
-  return [
-    'types' => [
-      'field-storage' => [
-        'name' => t('Field storage'),
-        'description' => t('Tokens related to field storage items.'),
-        'needs-data' => 'field-storage',
-      ],
-    ],
-    'tokens' => [
-      'field-storage' => [
-        'name' => [
-          'name' => t('Field name'),
-          'description' => t('Machine name of the field.'),
-        ],
-      ],
-    ],
-  ];
-}
-
-/**
- * Implements hook_tokens().
- */
-function field_tokens($type, $tokens, array $data = array(), array $options = array()) {
-  $sanitize = !empty($options['sanitize']);
-  $replacements = [];
-
-  if ($type == 'field-storage' && !empty($data['field-storage'])) {
-    /** @var \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage */
-    $field_storage = $data['field-storage'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'name':
-          $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($field_storage->getName()) : $field_storage->getName();
-          break;
-      }
-    }
-  }
-
-  return $replacements;
-}
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/field/field.tokens.inc
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @file
+ * Attach custom tokens to Drupal entities.
+ */
+
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Implements hook_token_info().
+ */
+function field_token_info() {
+  return [
+    'types' => [
+      'field-storage' => [
+        'name' => t('Field storage'),
+        'description' => t('Tokens related to field storage items.'),
+        'needs-data' => 'field-storage',
+      ],
+    ],
+    'tokens' => [
+      'field-storage' => [
+        'name' => [
+          'name' => t('Field name'),
+          'description' => t('Machine name of the field.'),
+        ],
+      ],
+    ],
+  ];
+}
+
+/**
+ * Implements hook_tokens().
+ */
+function field_tokens($type, $tokens, array $data = array(), array $options = array()) {
+  $sanitize = !empty($options['sanitize']);
+  $replacements = [];
+
+  if ($type == 'field-storage' && !empty($data['field-storage'])) {
+    /** @var \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage */
+    $field_storage = $data['field-storage'];
+
+    foreach ($tokens as $name => $original) {
+      switch ($name) {
+        case 'name':
+          $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($field_storage->getName()) : $field_storage->getName();
+          break;
+      }
+    }
+  }
+
+  return $replacements;
+}