diff --git a/core/modules/contextual/contextual.base.css b/core/modules/contextual/contextual.base.css
index 1456bef..1d33eee 100644
--- a/core/modules/contextual/contextual.base.css
+++ b/core/modules/contextual/contextual.base.css
@@ -6,10 +6,15 @@
 .contextual-region {
   position: relative;
 }
+
+/**
+ * Override .focusable:active and .focusable:focus set to
+ * 'position: static !important'.
+ */
 .contextual .trigger:focus {
-  /* Override the .is-focusable position: static */
   position: relative !important;
 }
+
 .contextual-links {
   display: none;
 }
diff --git a/core/modules/contextual/contextual.js b/core/modules/contextual/contextual.js
index afe0a61..ffdb73e 100644
--- a/core/modules/contextual/contextual.js
+++ b/core/modules/contextual/contextual.js
@@ -411,7 +411,7 @@ Drupal.contextual.collection = new Backbone.Collection([], { model: Drupal.conte
  *   A string representing a DOM fragment.
  */
 Drupal.theme.contextualTrigger = function () {
-  return '<button class="trigger visually-hidden is-focusable" type="button"></button>';
+  return '<button class="trigger visually-hidden focusable" type="button"></button>';
 };

 })(jQuery, Drupal, drupalSettings, Backbone, Modernizr);
diff --git a/core/modules/contextual/contextual.theme.css b/core/modules/contextual/contextual.theme.css
index 9852995..d7cc549 100644
--- a/core/modules/contextual/contextual.theme.css
+++ b/core/modules/contextual/contextual.theme.css
@@ -34,7 +34,8 @@
   border: 1px solid #ddd;
   border-radius: 13px;
   box-shadow: 1px 1px 2px rgba(0,0,0,0.3);
-  /* Override the .is-focusable height: auto */
+  /* Override .focusable width and height set to 'auto' */
+  width: 28px !important;
   height: 28px !important;
   float: right; /* LTR */
   margin: 0;
@@ -42,8 +43,6 @@
   padding: 0 2px;
   position: relative;
   right: 2px; /* LTR */
-  /* Override the .is-focusable height: auto */
-  width: 28px !important;
   text-indent: -9999px;
   cursor: pointer;
 }
diff --git a/core/modules/overlay/overlay-child.js b/core/modules/overlay/overlay-child.js
index a635f08..261f02a 100644
--- a/core/modules/overlay/overlay-child.js
+++ b/core/modules/overlay/overlay-child.js
@@ -69,11 +69,11 @@ Drupal.behaviors.overlayChild = {
     $(context).find('#overlay-disable-message')
       .focusin(function () {
         $(this).addClass('overlay-disable-message-focused')
-          .find('a.is-focusable').removeClass('visually-hidden');
+          .find('.focusable').removeClass('visually-hidden');
       })
       .focusout(function () {
         $(this).removeClass('overlay-disable-message-focused')
-          .find('a.is-focusable').addClass('visually-hidden');
+          .find('.focusable').addClass('visually-hidden');
       });
   }
 };
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index e92ab4d..efa8bc9 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -435,7 +435,7 @@ function theme_overlay_disable_message($variables) {
   foreach (array('profile_link', 'dismiss_message_link') as $key) {
     $element[$key]['#options']['attributes']['class'][] = 'visually-hidden';
     if (overlay_get_mode() == 'child') {
-      $element[$key]['#options']['attributes']['class'][] = 'is-focusable';
+      $element[$key]['#options']['attributes']['class'][] = 'focusable';
     }
   }

diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css
index 8dd6c53..b45481d 100644
--- a/core/modules/system/system.base.css
+++ b/core/modules/system/system.base.css
@@ -269,11 +269,11 @@ input {
 }

 /**
- * The .is-focusable class extends the .visually-hidden class to allow
- * the element to be focusable when navigated to via the keyboard.
+ * Forces a visually hidden element to be visible when navigated to via
+ * the keyboard.
  */
-.visually-hidden.is-focusable:active,
-.visually-hidden.is-focusable:focus {
+.visually-hidden.focusable:active,
+.visually-hidden.focusable:focus {
   position: static !important;
   clip: auto;
   overflow: visible;
diff --git a/core/modules/system/templates/html.html.twig b/core/modules/system/templates/html.html.twig
index 74a9b4a..153ff6b 100644
--- a/core/modules/system/templates/html.html.twig
+++ b/core/modules/system/templates/html.html.twig
@@ -38,7 +38,7 @@
   </head>
   <body{{ attributes }}>
     <div id="skip-link">
-      <a href="#main-content" class="visually-hidden is-focusable">
+      <a href="#main-content" class="visually-hidden focusable">
         {{ 'Skip to main content'|t }}
       </a>
     </div>
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 4898a11..7e03936 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -23,7 +23,7 @@
 <body class="{{ attributes.class }}"{{ attributes }}>

   <div id="skip-link">
-    <a href="#main-content" class="visually-hidden is-focusable">{{ 'Skip to main content'|t }}</a>
+    <a href="#main-content" class="visually-hidden focusable">{{ 'Skip to main content'|t }}</a>
   </div>

   <div id="page-wrapper"><div id="page">