diff --git a/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php b/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
index 8e0292b18cb..ef05717303c 100644
--- a/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
@@ -22,6 +22,13 @@ abstract class EntityConfirmFormBase extends EntityFormController implements Con
    */
   protected $request;
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getBaseFormID() {
+    return $this->entity->entityType() . '_confirm_form';
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/lib/Drupal/Core/Entity/EntityNGConfirmFormBase.php b/core/lib/Drupal/Core/Entity/EntityNGConfirmFormBase.php
index 1c345a0a6fa..fd042412cbd 100644
--- a/core/lib/Drupal/Core/Entity/EntityNGConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityNGConfirmFormBase.php
@@ -22,6 +22,13 @@ abstract class EntityNGConfirmFormBase extends EntityFormControllerNG implements
    */
   protected $request;
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getBaseFormID() {
+    return $this->entity->entityType() . '_confirm_form';
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 1d90683e8be..fbdf07d68c5 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1919,11 +1919,6 @@ function theme_node_recent_content($variables) {
  * Adds node-type specific visibility options to block configuration form.
  */
 function node_form_block_form_alter(&$form, &$form_state) {
-  // These options should be added to most block forms, but not when deleting.
-  if ($form_state['controller']->getOperation() == 'delete') {
-    return;
-  }
-
   $block = $form_state['controller']->getEntity();
   $visibility = $block->get('visibility');
   $form['visibility']['node_type'] = array(