diff --git a/core/modules/user/lib/Drupal/user/EventSubscriber/UserLoginBlockConfigChangeSubscriber.php b/core/modules/user/lib/Drupal/user/EventSubscriber/UserLoginBlockConfigChangeSubscriber.php
deleted file mode 100644
index d307dee..0000000
--- a/core/modules/user/lib/Drupal/user/EventSubscriber/UserLoginBlockConfigChangeSubscriber.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\EventSubscriber\UserLoginBlockConfigChangeSubscriber.
- */
-
-namespace Drupal\user\EventSubscriber;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Config\ConfigCrudEvent;
-use Drupal\Core\Config\ConfigEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Invalidates the cache tag for the "User login" block when necessary.
- */
-class UserLoginBlockConfigChangeSubscriber implements EventSubscriberInterface {
-
-  /**
-   * Reacts to config event.
-   *
-   * @param \Drupal\Core\Config\ConfigCrudEvent $event
-   *   The configuration event.
-   */
-  public function onConfigSave(ConfigCrudEvent $event) {
-    if ($event->getConfig()->getName() === 'user.settings' && $event->isChanged('register')) {
-      Cache::invalidateTags(array('block_plugin' => array('user_login_block')));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 0);
-    return $events;
-  }
-
-}
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
index 19266ab..c087889 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
@@ -64,13 +64,4 @@ public function build() {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    // This is a block containing a simple form without state, which is safe to
-    // cache forever.
-    return array('cache' => array('max_age' => \Drupal\Core\Cache\Cache::PERMANENT));
-  }
-
 }
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 45af7f1..7f73ccc 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -35,10 +35,6 @@ services:
     class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber
     tags:
       - { name: event_subscriber }
-  user_login_block_config_change_subscriber:
-    class: Drupal\user\EventSubscriber\UserLoginBlockConfigChangeSubscriber
-    tags:
-      - { name: event_subscriber }
   theme.negotiator.admin_theme:
     class: Drupal\user\Theme\AdminNegotiator
     arguments: ['@current_user', '@config.factory', '@entity.manager']