diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index 220ab97..586e4df 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -324,29 +324,15 @@ public function blockValidate(ViewsBlock $block, array $form, array &$form_state
    * * @see \Drupal\views\Plugin\Block\ViewsBlock::blockSubmit()
    */
   public function blockSubmit(ViewsBlock $block, $form, &$form_state) {
-    if (isset($form_state['values']['override']['items_per_page']) && $form_state['values']['override']['items_per_page'] !== '') {
+    if (isset($form_state['values']['override']['items_per_page'])) {
       $block->setConfig('items_per_page', $form_state['values']['override']['items_per_page']);
     }
-    if (isset($form_state['values']['override']['more_link']) && $form_state['values']['override']['more_link'] !== '') {
+    if (isset($form_state['values']['override']['more_link'])) {
       $block->setConfig('more_link', $form_state['values']['override']['more_link']);
     }
   }
 
   /**
-   * Allows to change the display settings right before executing the block.
-   */
-  public function preBlockBuild(ViewsBlock $block) {
-    $block_configuration = $block->getConfig();
-    if (isset($block_configuration['items_per_page']) && $block_configuration['items_per_page'] !== '') {
-      $this->view->setItemsPerPage($block_configuration['items_per_page']);
-    }
-    if (isset($block_configuration['more_link']) && $block_configuration['more_link'] !== '') {
-      $this->setOption('use_more_always', 1);
-    }
-  }
-
-
-  /**
    * Block views use exposed widgets only if AJAX is set.
    */
   public function usesExposed() {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index a1c1937..977c7b6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -90,7 +90,6 @@ public function access() {
    * Overrides \Drupal\block\BlockBase::form().
    */
   public function form($form, &$form_state) {
-    $form = parent::form($form, $form_state);
     // Set the default label to '' so the views internal title is used.
     $form['label']['#default_value'] = '';
     $form['label']['#access'] = FALSE;