diff --git a/core/modules/block/custom_block/src/Entity/CustomBlock.php b/core/modules/block/custom_block/src/Entity/CustomBlock.php
index 585026e3998c0a625e437c057b1330ba9fb367d1..53e58b406878e6c9a5c2d45731caa60bfc50da6f 100644
--- a/core/modules/block/custom_block/src/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/src/Entity/CustomBlock.php
@@ -184,8 +184,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['type'] = FieldDefinition::create('entity_reference')
       ->setLabel(t('Block type'))
       ->setDescription(t('The block type.'))
-      ->setSetting('target_type', 'custom_block_type')
-      ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH);
+      ->setSetting('target_type', 'custom_block_type');
 
     $fields['log'] = FieldDefinition::create('string_long')
       ->setLabel(t('Revision log message'))
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index 7fb33e6909385955d4bb54bfdddf4efbae7e6713..81b3ca2566657afe9a195fb101e2354f4df41b67 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -357,7 +357,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setLabel(t('Type'))
       ->setDescription(t('The node type.'))
       ->setSetting('target_type', 'node_type')
-      ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH)
       ->setReadOnly(TRUE);
 
     $fields['langcode'] = FieldDefinition::create('language')
diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index 53106e7b2cdc9031056b2d22221ad606e35302f1..80f0261d6958bcc4de20c4824ea14abf1fc95805 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -167,7 +167,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setLabel(t('Shortcut set'))
       ->setDescription(t('The bundle of the shortcut.'))
       ->setSetting('target_type', 'shortcut_set')
-      ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH)
       ->setRequired(TRUE);
 
     $fields['title'] = FieldDefinition::create('string')
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 8b6996a007184c67575be8323b8f834297c242b1..435cbe60d705f56a4624e8c13df18a73f26a9d88 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -116,8 +116,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['vid'] = FieldDefinition::create('entity_reference')
       ->setLabel(t('Vocabulary'))
       ->setDescription(t('The vocabulary to which the term is assigned.'))
-      ->setSetting('target_type', 'taxonomy_vocabulary')
-      ->setSetting('max_length', EntityTypeInterface::BUNDLE_MAX_LENGTH);
+      ->setSetting('target_type', 'taxonomy_vocabulary');
 
     $fields['langcode'] = FieldDefinition::create('language')
       ->setLabel(t('Language code'))