diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index e12d5df..390d976 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -757,11 +757,11 @@ function entity_get_render_display(EntityInterface $entity, $view_mode) {
   // the former if the latter does not exist is disabled.
   if ($view_mode != 'default') {
     $ids = array(
-      'default' => 'entity.display.' . $entity->entityType() . '.' . $entity->bundle() . '.default',
-      $view_mode => 'entity.display.' . $entity->entityType() . '.' . $entity->bundle() . '.' . $view_mode,
+      'default' => $entity_type . '.' . $bundle . '.default',
+      $view_mode => $entity_type . '.' . $bundle . '.' . $view_mode,
     );
-    $entity_displays = \Drupal::service('config.storage')->readMultiple($ids);
-    if (isset($entity_displays[$ids[$view_mode]]) && $entity_displays[$ids[$view_mode]]['status']) {
+    $entity_displays = entity_load_multiple('entity_display', $ids);
+    if (isset($entity_displays[$ids[$view_mode]]) && $entity_displays[$ids[$view_mode]]->status()) {
       $render_view_mode = $view_mode;
     }
   }
@@ -857,11 +857,11 @@ function entity_get_render_form_display(EntityInterface $entity, $form_mode) {
   // fallback to the former if the latter does not exist is disabled.
   if ($form_mode != 'default') {
     $ids = array(
-      'default' => 'entity.form_display.' . $entity->entityType() . '.' . $entity->bundle() . '.default',
-      $form_mode => 'entity.form_display.' . $entity->entityType() . '.' . $entity->bundle() . '.' . $form_mode,
+      'default' => $entity_type . '.' . $bundle . '.default',
+      $form_mode => $entity_type . '.' . $bundle . '.' . $form_mode,
     );
-    $entity_form_displays = \Drupal::service('config.storage')->readMultiple($ids);
-    if (isset($entity_form_displays[$ids[$form_mode]]) && $entity_form_displays[$ids[$form_mode]]['status']) {
+    $entity_form_displays = entity_load_multiple('entity_form_display', $ids);
+    if (isset($entity_form_displays[$ids[$form_mode]]) && $entity_form_displays[$ids[$form_mode]]->status()) {
       $render_form_mode = $form_mode;
     }
   }