diff --git a/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php b/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
index c3b54b2..a15d255 100644
--- a/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
@@ -55,22 +55,6 @@
 interface FieldDefinitionInterface extends StorageFieldDefinitionInterface, ListDataDefinitionInterface {
 
   /**
-   * Value indicating a field accepts an unlimited number of values.
-   */
-  const CARDINALITY_UNLIMITED = -1;
-
-  /**
-   * Returns the maximum number of items allowed for the field.
-   *
-   * Possible values are positive integers or
-   * FieldDefinitionInterface::CARDINALITY_UNLIMITED.
-   *
-   * @return int
-   *   The field cardinality.
-   */
-  public function getCardinality();
-
-  /**
    * Returns whether the display for the field can be configured.
    *
    * @param string $display_context
diff --git a/core/lib/Drupal/Core/Field/StorageFieldDefinitionInterface.php b/core/lib/Drupal/Core/Field/StorageFieldDefinitionInterface.php
index 5c62dc3..7a211a0 100644
--- a/core/lib/Drupal/Core/Field/StorageFieldDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Field/StorageFieldDefinitionInterface.php
@@ -27,6 +27,11 @@
 interface StorageFieldDefinitionInterface {
 
   /**
+   * Value indicating a field accepts an unlimited number of values.
+   */
+  const CARDINALITY_UNLIMITED = -1;
+
+  /**
    * Returns the machine name of the field.
    *
    * This defines how the field data is accessed from the entity. For example,
@@ -123,6 +128,17 @@ public function getDescription();
   public function isMultiple();
 
   /**
+   * Returns the maximum number of items allowed for the field.
+   *
+   * Possible values are positive integers or
+   * FieldDefinitionInterface::CARDINALITY_UNLIMITED.
+   *
+   * @return int
+   *   The field cardinality.
+   */
+  public function getCardinality();
+
+  /**
    * Gets the definition of a contained property.
    *
    * @param string $name