diff --git a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
index 85ef357..d16eca1 100644
--- a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php
@@ -232,13 +232,6 @@ class EntityType extends Plugin {
   public $route_base_path;
 
   /**
-   * The prefix for the bundles of this entity type.
-   *
-   * @var string (optional)
-   */
-  public $bundle_prefix;
-
-  /**
    * The base menu router path to which the entity admin user interface responds.
    *
    * It can be used to generate UI links and to attach additional router items
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 67e5690..2223ec0 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -403,10 +403,6 @@ public function getAdminPath($entity_type, $bundle) {
     $entity_info = $this->getDefinition($entity_type);
     // Check for an entity type's admin base path.
     if (isset($entity_info['route_base_path'])) {
-      // If the entity type has a bundle prefix, strip it out of the path.
-      if (isset($entity_info['bundle_prefix'])) {
-        $bundle = str_replace($entity_info['bundle_prefix'], '', $bundle);
-      }
       // Replace any dynamic 'bundle' portion of the path with the actual bundle.
       $admin_path = str_replace('{bundle}', $bundle, $entity_info['route_base_path']);
     }
@@ -430,9 +426,6 @@ public function getAdminPath($entity_type, $bundle) {
    */
   public function getAdminRouteInfo($entity_type, $bundle) {
     $entity_info = $this->getDefinition($entity_type);
-    if (isset($entity_info['bundle_prefix'])) {
-      $bundle = str_replace($entity_info['bundle_prefix'], '', $bundle);
-    }
     return array(
       'route_name' => "field_ui.overview_$entity_type",
       'route_parameters' => array(
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
index b17831b..5a3f3d1 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
@@ -75,9 +75,6 @@ public static function create(ContainerInterface $container) {
    */
   public function buildForm(array $form, array &$form_state, $entity_type = NULL, $bundle = NULL) {
     $entity_info = $this->entityManager->getDefinition($entity_type);
-    if (!empty($entity_info['bundle_prefix'])) {
-      $bundle = $entity_info['bundle_prefix'] . $bundle;
-    }
 
     $this->entity_type = $entity_type;
     $this->bundle = $bundle;