diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 42e4d77..566b2cc 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -160,7 +160,6 @@ class EntityManager extends PluginManagerBase {
       'default' => 'Drupal\Core\Entity\EntityFormController',
     ),
     'list_controller_class' => 'Drupal\Core\Entity\EntityListController',
-    'render_controller_class' => 'Drupal\Core\Entity\EntityRenderController',
     'access_controller_class' => 'Drupal\Core\Entity\EntityAccessController',
     'static_cache' => TRUE,
     'translation' => array(),
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php
index a5911e9..8a5a465 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php
@@ -19,6 +19,7 @@
  *   label = @Translation("Test Entity"),
  *   module = "field_test",
  *   controller_class = "Drupal\field_test\TestEntityController",
+ *   render_controller_class = "Drupal\Core\Entity\EntityRenderController",
  *   form_controller_class = {
  *     "default" = "Drupal\field_test\TestEntityFormController"
  *   },
diff --git a/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php b/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php
index e811c58..dd12364 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php
@@ -20,6 +20,7 @@
  *   label = @Translation("File"),
  *   module = "file",
  *   controller_class = "Drupal\file\FileStorageController",
+ *   render_controller_class = "Drupal\Core\Entity\EntityRenderController",
  *   base_table = "file_managed",
  *   entity_keys = {
  *     "id" = "fid",
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
index bccbb67..24c68c8 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
@@ -20,6 +20,7 @@
  *   label = @Translation("Menu link"),
  *   module = "menu_link",
  *   controller_class = "Drupal\menu_link\MenuLinkStorageController",
+ *   render_controller_class = "Drupal\Core\Entity\EntityRenderController",
  *   form_controller_class = {
  *     "default" = "Drupal\menu_link\MenuLinkFormController"
  *   },
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
index 21e914d..98245ae 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php
@@ -19,6 +19,7 @@
  *   label = @Translation("User"),
  *   module = "user",
  *   controller_class = "Drupal\user\UserStorageController",
+ *   render_controller_class = "Drupal\Core\Entity\EntityRenderController",
  *   access_controller_class = "Drupal\user\UserAccessController",
  *   form_controller_class = {
  *     "profile" = "Drupal\user\ProfileFormController",