reverted:
--- b/core/modules/shortcut/src/Entity/Shortcut.php
+++ a/core/modules/shortcut/src/Entity/Shortcut.php
@@ -31,7 +31,6 @@
  *       "edit" = "Drupal\shortcut\ShortcutForm",
  *       "delete" = "Drupal\shortcut\Form\ShortcutDeleteForm"
  *     },
- *     "view_builder" = "Drupal\shortcut\ShortcutViewBuilder",
  *     "translation" = "Drupal\content_translation\ContentTranslationHandler"
  *   },
  *   base_table = "shortcut",
reverted:
--- b/core/modules/shortcut/src/ShortcutViewBuilder.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\shortcut\ShortcutViewBuilder
- */
-
-namespace Drupal\shortcut;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityViewBuilder;
-
-class ShortcutViewBuilder extends EntityViewBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getBuildDefaults(EntityInterface $entity, $view_mode) {
-    $defaults = parent::getBuildDefaults($entity, $view_mode);
-    $defaults['#theme'] = 'links__toolbar_shortcuts';
-
-    return $defaults;
-  }
-
-}
only in patch2:
unchanged:
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -438,3 +438,12 @@ function shortcut_themes_installed($theme_list) {
     }
   }
 }
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function shortcut_entity_type1_alter(&$entity_types) {
+  // Unset view builder for Shortcut entity which is set by default in
+  // Drupal\Core\Entity\ContentEntityBase.
+  $entity_types['shortcut']->setViewBuilderClass(NULL);
+}