diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 172186a84e860210edb48d14dd91d72d02f6837a..902c6827cae71d1137185bcdee75220197f56d20 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -237,15 +237,6 @@ protected function buildVisibilityInterface(array $form, FormStateInterface $for
         continue;
       }
 
-      // Don't display the deprecated node type condition unless it has existing
-      // settings.
-      // @todo Make this more generic in
-      //   https://www.drupal.org/project/drupal/issues/2922451. Also remove
-      //   the node_type specific logic below.
-      if ($condition_id == 'node_type' && !isset($visibility[$condition_id])) {
-        continue;
-      }
-
       /** @var \Drupal\Core\Condition\ConditionInterface $condition */
       $condition = $this->manager->createInstance($condition_id, $visibility[$condition_id] ?? []);
       $form_state->set(['conditions', $condition_id], $condition);
@@ -256,13 +247,6 @@ protected function buildVisibilityInterface(array $form, FormStateInterface $for
       $form[$condition_id] = $condition_form;
     }
 
-    if (isset($form['node_type'])) {
-      $form['node_type']['#title'] = $this->t('Content types (deprecated)');
-      $form['node_type']['bundles']['#title'] = $this->t('Content types');
-      $form['node_type']['negate']['#type'] = 'value';
-      $form['node_type']['negate']['#title_display'] = 'invisible';
-      $form['node_type']['negate']['#value'] = $form['node_type']['negate']['#default_value'];
-    }
     if (isset($form['entity_bundle:node'])) {
       $form['entity_bundle:node']['negate']['#type'] = 'value';
       $form['entity_bundle:node']['negate']['#title_display'] = 'invisible';