.../src/Tests/PageCacheTagsIntegrationTest.php         | 12 ++++--------
 .../config/install/block.block.bartik_login.yml        | 18 ------------------
 core/profiles/standard/standard.links.menu.yml         |  5 +++++
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
index c471cea..e76dfa0 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -71,13 +71,13 @@ function testPageCacheTags() {
 
     $cache_contexts = [
       'languages:' . LanguageInterface::TYPE_INTERFACE,
-      'route',
+      'route.menu_active_trails:account',
+      'route.menu_active_trails:footer',
+      'route.menu_active_trails:main',
+      'route.menu_active_trails:tools',
       'theme',
       'timezone',
       'user.permissions',
-      // The user login block access depends on whether the current user is
-      // logged in or not.
-      'user.roles:anonymous',
       // The cache contexts associated with the (in)accessible menu links are
       // bubbled.
       'user.roles:authenticated',
@@ -94,7 +94,6 @@ function testPageCacheTags() {
       'config:block.block.bartik_breadcrumbs',
       'config:block.block.bartik_content',
       'config:block.block.bartik_tools',
-      'config:block.block.bartik_login',
       'config:block.block.bartik_footer',
       'config:block.block.bartik_help',
       'config:block.block.bartik_search',
@@ -111,7 +110,6 @@ function testPageCacheTags() {
       'config:system.menu.tools',
       'config:system.menu.footer',
       'config:system.menu.main',
-      'config:system.site',
       // FinishResponseSubscriber adds this cache tag to responses that have the
       // 'user.permissions' cache context for anonymous users.
       'config:user.role.anonymous',
@@ -128,7 +126,6 @@ function testPageCacheTags() {
       'config:block.block.bartik_breadcrumbs',
       'config:block.block.bartik_content',
       'config:block.block.bartik_tools',
-      'config:block.block.bartik_login',
       'config:block.block.bartik_help',
       'config:block.block.bartik_search',
       'config:block.block.' . $block->id(),
@@ -145,7 +142,6 @@ function testPageCacheTags() {
       'config:system.menu.tools',
       'config:system.menu.footer',
       'config:system.menu.main',
-      'config:system.site',
       'comment_list',
       'node_list',
       'config:views.view.comments_recent',
diff --git a/core/profiles/standard/config/install/block.block.bartik_login.yml b/core/profiles/standard/config/install/block.block.bartik_login.yml
deleted file mode 100644
index 3a5f543..0000000
--- a/core/profiles/standard/config/install/block.block.bartik_login.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-id: bartik_login
-theme: bartik
-weight: 0
-status: true
-langcode: en
-region: sidebar_first
-plugin: user_login_block
-settings:
-  id: user_login_block
-  label: 'User login'
-  provider: user
-  label_display: visible
-dependencies:
-  module:
-    - user
-  theme:
-    - bartik
-visibility: {  }
diff --git a/core/profiles/standard/standard.links.menu.yml b/core/profiles/standard/standard.links.menu.yml
index 2278b21..5fd0623 100644
--- a/core/profiles/standard/standard.links.menu.yml
+++ b/core/profiles/standard/standard.links.menu.yml
@@ -2,3 +2,8 @@ standard.front_page:
   title: 'Home'
   route_name: '<front>'
   menu_name: main
+standard.login:
+  route_name: user.login
+  title: 'Log in'
+  weight: -10
+  menu_name: account