diff --git a/core/modules/block/config/schema/block.schema.yml b/core/modules/block/config/schema/block.schema.yml
index b6ba2ae..1ed3f49 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 fba5659..d0fdaaf 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);
 
@@ -359,6 +360,21 @@ public function delete(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.
    *
    * @param \Drupal\block\BlockInterface $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 bb65174..8874c7e 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 aeded26..f3c1735 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 7ca1d45..4ca8266 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 0d1fb7b..a452643 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 21d410d..5490936 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 0098966..074d478 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 7578cb6..02c7e1e 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 a79e8b9..f750971 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 47aa159..65cdd5a 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 24754e7..df52cde 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 c1a6942..d23657c 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 5850d61..0ec0dcd 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 092fa26..39062fd 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 e1591e5..18f52c6 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 5e39acf..8a2dd91 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 f76a568..989a789 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