diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index 482659e..b4e9ee5 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -1311,6 +1311,7 @@ function field_attach_rename_bundle($entity_type, $bundle_old, $bundle_new) {
 
   // Clear the cache.
   field_cache_clear();
+  entity_info_cache_clear();
 
   // Update bundle settings.
   $settings = variable_get('field_bundle_settings_' . $entity_type . '__' . $bundle_old, array());
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 776b965..ab807dc 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -51,9 +51,7 @@ function field_ui_help($path, $arg) {
  */
 function field_ui_field_attach_rename_bundle($entity_type, $bundle_old, $bundle_new) {
   // The Field UI relies on entity_get_info() to build menu items for entity
-  // field administration pages. Clear the entity info cache and ensure that
-  // the menu is rebuilt.
-  entity_info_cache_clear();
+  // field administration pages. Ensure that the menu is rebuilt.
   menu_rebuild();
 }