diff --git a/core/modules/config/tests/config_schema_test/config/install/block.block.views_block__content_recent_block_1_2.yml b/core/modules/config/tests/config_schema_test/config/install/block.block.views_block__content_recent_block_1_2.yml
index 2b52bd5..f68f919 100644
--- a/core/modules/config/tests/config_schema_test/config/install/block.block.views_block__content_recent_block_1_2.yml
+++ b/core/modules/config/tests/config_schema_test/config/install/block.block.views_block__content_recent_block_1_2.yml
@@ -24,6 +24,3 @@ settings:
     contexts: {  }
   views_label: 'Recent block content '
   items_per_page: none
-  override:
-    items_per_page: none
-  views_label_checkbox: true
diff --git a/core/modules/views/config/schema/views.schema.yml b/core/modules/views/config/schema/views.schema.yml
index 592bbfe..72b25fd 100644
--- a/core/modules/views/config/schema/views.schema.yml
+++ b/core/modules/views/config/schema/views.schema.yml
@@ -128,13 +128,3 @@ block.settings.views_block:*:
     items_per_page:
       type: string
       label: 'Items per block'
-    override:
-      type: mapping
-      label: 'Override'
-      mapping:
-        items_per_page:
-          type: string
-          label: 'Items per block'
-    views_label_checkbox:
-      type: boolean
-      label: 'Override title'
diff --git a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
index 4736fbc..953dfae 100644
--- a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
+++ b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
@@ -171,6 +171,7 @@ public function blockSubmit($form, FormStateInterface $form_state) {
     else {
       $this->configuration['views_label'] = '';
     }
+    $form_state->unsetValue('views_label_checkbox');
   }
 
   /**
diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php
index 2c41598..d2bfe26 100644
--- a/core/modules/views/src/Plugin/views/display/Block.php
+++ b/core/modules/views/src/Plugin/views/display/Block.php
@@ -332,6 +332,7 @@ public function blockSubmit(ViewsBlock $block, $form, FormStateInterface $form_s
     if ($items_per_page = $form_state->getValue(array('override', 'items_per_page'))) {
       $block->setConfigurationValue('items_per_page', $items_per_page);
     }
+    $form_state->unsetValue(array('override', 'items_per_page'));
   }
 
   /**