Issue #2011018 followup by tim.plunkett, andypost: Reconcile entity forms and confirm forms.

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}
    */

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}
    */

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(