core/core.services.yml                        |  2 +-
 core/modules/user/src/UserServiceProvider.php | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/core/core.services.yml b/core/core.services.yml
index 4537900..f5e7c1c 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -9,7 +9,7 @@ parameters:
     auto_reload: null
     cache: true
   renderer.config:
-    required_cache_contexts: ['languages:language_interface', 'theme']
+    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
     auto_placeholder_conditions:
       max-age: 0
       contexts: ['session', 'user']
diff --git a/core/modules/user/src/UserServiceProvider.php b/core/modules/user/src/UserServiceProvider.php
index 42454cf..9b61097 100644
--- a/core/modules/user/src/UserServiceProvider.php
+++ b/core/modules/user/src/UserServiceProvider.php
@@ -25,21 +25,6 @@ class UserServiceProvider implements ServiceModifierInterface {
   public function alter(ContainerBuilder $container) {
     $container->setDefinition('password_original', $container->getDefinition('password'));
     $container->setDefinition('password', $container->getDefinition('password_migrate'));
-
-    // Allow sites to opt out from the cacheability safeguards.
-    if ($container->hasParameter('renderer.cacheability_safeguards') && $container->getParameter('renderer.cacheability_safeguards') === FALSE) {
-      return;
-    }
-
-    // Make the 'user.permissions' cache context required.
-    if ($container->hasParameter('renderer.config')) {
-      $renderer_config = $container->getParameter('renderer.config');
-      if (!in_array('user.permissions', $renderer_config['required_cache_contexts'])) {
-        $renderer_config['required_cache_contexts'][] = 'user.permissions';
-        sort($renderer_config['required_cache_contexts']);
-      }
-      $container->setParameter('renderer.config', $renderer_config);
-    }
   }
 
 }