diff --git a/core/modules/block/config/schema/block.schema.yml b/core/modules/block/config/schema/block.schema.yml
index b6ba2aee7cbaab2f30fed1288498729300352614..1ed3f4975cc43d66ac3f3243b1836bd0ff2ed5ae 100644
--- a/core/modules/block/config/schema/block.schema.yml
+++ b/core/modules/block/config/schema/block.schema.yml
@@ -59,9 +59,6 @@ block.block.*:
               sequence:
                - type: string
                  label: 'Node type'
-        visibility__active_tab:
-          type: string
-          label: 'Visibility active tab'
     plugin:
       type: string
       label: 'Plugin'
diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/lib/Drupal/block/BlockFormController.php
index 8933395269408f1b0083fd799407d848e127bc08..4990a53076b49254b73a7639cbb8dba5b13bca06 100644
--- a/core/modules/block/lib/Drupal/block/BlockFormController.php
+++ b/core/modules/block/lib/Drupal/block/BlockFormController.php
@@ -319,6 +319,7 @@ public function submit(array $form, array &$form_state) {
       'values' => &$form_state['values']['settings'],
       'errors' => $form_state['errors'],
     );
+
     // Call the plugin submit handler.
     $entity->getPlugin()->submitConfigurationForm($form, $settings);
 
@@ -340,6 +341,21 @@ public function submit(array $form, array &$form_state) {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function buildEntity(array $form, array &$form_state) {
+    $entity = parent::buildEntity($form, $form_state);
+
+    // visibility__active_tab is Form API state and not configuration.
+    // @todo Fix vertical tabs.
+    $visibility = $entity->get('visibility');
+    unset($visibility['visibility__active_tab']);
+    $entity->set('visibility', $visibility);
+
+    return $entity;
+  }
+
   /**
    * Generates a unique machine name for a block.
    *
diff --git a/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml b/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
index 7c75e4d13a7790459837bd4260563cef051985af..9a8383c0fbed0570360169f9a5e61121c78cd037 100644
--- a/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
+++ b/core/modules/block/tests/modules/block_test/config/block.block.test_block.yml
@@ -18,4 +18,3 @@ visibility:
     roles: {  }
   node_type:
     types: {  }
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/minimal/config/block.block.stark_admin.yml b/core/profiles/minimal/config/block.block.stark_admin.yml
index aeded26d91682c11f6e358c885685257c82d9182..f3c17358ea29100973b9758bb90fc74a004bfe0b 100644
--- a/core/profiles/minimal/config/block.block.stark_admin.yml
+++ b/core/profiles/minimal/config/block.block.stark_admin.yml
@@ -18,4 +18,3 @@ visibility:
     roles: {  }
   node_type:
     types: {  }
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/minimal/config/block.block.stark_login.yml b/core/profiles/minimal/config/block.block.stark_login.yml
index 7ca1d456167b402fecdd56b1c108ba576f0b0bf5..4ca826641dec80dd27f0bb2a8006309051639ec0 100644
--- a/core/profiles/minimal/config/block.block.stark_login.yml
+++ b/core/profiles/minimal/config/block.block.stark_login.yml
@@ -18,4 +18,3 @@ visibility:
     roles: {  }
   node_type:
     types: {  }
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/minimal/config/block.block.stark_tools.yml b/core/profiles/minimal/config/block.block.stark_tools.yml
index 0d1fb7b42d8cd84a4867657bb750ba9c6eaf40a1..a4526432c912cf1e0b60e0f6b7f51dee6ca8d344 100644
--- a/core/profiles/minimal/config/block.block.stark_tools.yml
+++ b/core/profiles/minimal/config/block.block.stark_tools.yml
@@ -18,4 +18,3 @@ visibility:
     roles: {  }
   node_type:
     types: {  }
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
index 21d410d53941d074d697fcce0148921afa2875d9..549093610946659efca8a00397a7e7852e22734f 100644
--- a/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
+++ b/core/profiles/standard/config/block.block.bartik_breadcrumbs.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_content.yml b/core/profiles/standard/config/block.block.bartik_content.yml
index 009896643946a335e4af96b7c94b83ed1a783a8f..074d4785b0089d75b541ecac1784a7704132883f 100644
--- a/core/profiles/standard/config/block.block.bartik_content.yml
+++ b/core/profiles/standard/config/block.block.bartik_content.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_footer.yml b/core/profiles/standard/config/block.block.bartik_footer.yml
index 7578cb6d01e61f3616c75dca3f30140424f62c3c..02c7e1e9780d4917b855fbfc838ace5df48645a6 100644
--- a/core/profiles/standard/config/block.block.bartik_footer.yml
+++ b/core/profiles/standard/config/block.block.bartik_footer.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_help.yml b/core/profiles/standard/config/block.block.bartik_help.yml
index a79e8b99107abf3a15435ecda15a98c3a0c0c77e..f7509717c33c8729f4cfff1388ec205241e3846a 100644
--- a/core/profiles/standard/config/block.block.bartik_help.yml
+++ b/core/profiles/standard/config/block.block.bartik_help.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_login.yml b/core/profiles/standard/config/block.block.bartik_login.yml
index 47aa1597ffc63f289bf5b07ac82165874c5d4c50..65cdd5a72b165d0b68bf87a3812e984e1f57452e 100644
--- a/core/profiles/standard/config/block.block.bartik_login.yml
+++ b/core/profiles/standard/config/block.block.bartik_login.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_powered.yml b/core/profiles/standard/config/block.block.bartik_powered.yml
index 24754e7c3db357f180215d07e476c0916115a3f7..df52cde1ec59e7f5280c3ab04975505c3382027e 100644
--- a/core/profiles/standard/config/block.block.bartik_powered.yml
+++ b/core/profiles/standard/config/block.block.bartik_powered.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_search.yml b/core/profiles/standard/config/block.block.bartik_search.yml
index c1a6942b3b7a8c0125f9e56990d585270f682831..d23657cca12d414ef9186dcb5e6386ac92a011be 100644
--- a/core/profiles/standard/config/block.block.bartik_search.yml
+++ b/core/profiles/standard/config/block.block.bartik_search.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.bartik_tools.yml b/core/profiles/standard/config/block.block.bartik_tools.yml
index 5850d6117720535bd9d919f5a415473e60dd89a8..0ec0dcd4ba29ebf52e0149b16fd7bf3ec372946b 100644
--- a/core/profiles/standard/config/block.block.bartik_tools.yml
+++ b/core/profiles/standard/config/block.block.bartik_tools.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.seven_breadcrumbs.yml b/core/profiles/standard/config/block.block.seven_breadcrumbs.yml
index 092fa2633701d78e4ef792dc22996d63e1b10ed0..39062fd2d225d5b3197d9ecfe68d80079ff80bd0 100644
--- a/core/profiles/standard/config/block.block.seven_breadcrumbs.yml
+++ b/core/profiles/standard/config/block.block.seven_breadcrumbs.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.seven_content.yml b/core/profiles/standard/config/block.block.seven_content.yml
index e1591e55a4f9cc44294b8ddd3386b1507664b0c6..18f52c621eddf918734d8074c4cef5a38b171b5f 100644
--- a/core/profiles/standard/config/block.block.seven_content.yml
+++ b/core/profiles/standard/config/block.block.seven_content.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.seven_help.yml b/core/profiles/standard/config/block.block.seven_help.yml
index 5e39acf1f295de8804c3dbb5eb9b97f2e6a1c583..8a2dd9112500c7a72f4ddf7025c5531b2acc6820 100644
--- a/core/profiles/standard/config/block.block.seven_help.yml
+++ b/core/profiles/standard/config/block.block.seven_help.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path
diff --git a/core/profiles/standard/config/block.block.seven_login.yml b/core/profiles/standard/config/block.block.seven_login.yml
index f76a568d70062b001a5e153a4e0d4595eb0101ac..989a7895603d25eeaa36178358239df137a0a955 100644
--- a/core/profiles/standard/config/block.block.seven_login.yml
+++ b/core/profiles/standard/config/block.block.seven_login.yml
@@ -21,4 +21,3 @@ visibility:
     types:
       article: '0'
       page: '0'
-  visibility__active_tab: edit-visibility-path