diff --git a/core/modules/block/src/BlockBase.php b/core/modules/block/src/BlockBase.php
index 36b7107..7af838b 100644
--- a/core/modules/block/src/BlockBase.php
+++ b/core/modules/block/src/BlockBase.php
@@ -291,24 +291,15 @@ public function buildConfigurationForm(array $form, array &$form_state) {
     if (isset($form['visibility']['node_type'])) {
       $form['visibility']['node_type']['#title'] = $this->t('Content types');
       $form['visibility']['node_type']['bundles']['#title'] = $this->t('Content types');
-      $form['visibility']['node_type']['negate']['#type'] = 'radios';
+      $form['visibility']['node_type']['negate']['#type'] = 'value';
       $form['visibility']['node_type']['negate']['#title_display'] = 'invisible';
-      $form['visibility']['node_type']['negate']['#default_value'] = (int) $form['visibility']['node_type']['negate']['#default_value'];
-      $form['visibility']['node_type']['negate']['#options'] = array(
-        $this->t('Show for the selected content types'),
-        $this->t('Hide for the selected content types'),
-      );
+      $form['visibility']['node_type']['negate']['#value'] = $form['visibility']['node_type']['negate']['#default_value'];
     }
     if (isset($form['visibility']['user_role'])) {
       $form['visibility']['user_role']['#title'] = $this->t('Roles');
       unset($form['visibility']['user_role']['roles']['#description']);
-      $form['visibility']['user_role']['negate']['#type'] = 'radios';
-      $form['visibility']['user_role']['negate']['#title_display'] = 'invisible';
-      $form['visibility']['user_role']['negate']['#default_value'] = (int) $form['visibility']['user_role']['negate']['#default_value'];
-      $form['visibility']['user_role']['negate']['#options'] = array(
-        $this->t('Show for the selected roles'),
-        $this->t('Hide for the selected roles'),
-      );
+      $form['visibility']['user_role']['negate']['#type'] = 'value';
+      $form['visibility']['user_role']['negate']['#value'] = $form['visibility']['user_role']['negate']['#default_value'];
     }
     if (isset($form['visibility']['request_path'])) {
       $form['visibility']['request_path']['#title'] = $this->t('Pages');
@@ -321,13 +312,8 @@ public function buildConfigurationForm(array $form, array &$form_state) {
       );
     }
     if (isset($form['visibility']['language'])) {
-      $form['visibility']['language']['negate']['#type'] = 'radios';
-      $form['visibility']['language']['negate']['#title_display'] = 'invisible';
-      $form['visibility']['language']['negate']['#default_value'] = (int) $form['visibility']['language']['negate']['#default_value'];
-      $form['visibility']['language']['negate']['#options'] = array(
-        $this->t('Show for the selected languages'),
-        $this->t('Hide for the selected languages'),
-      );
+      $form['visibility']['language']['negate']['#type'] = 'value';
+      $form['visibility']['language']['negate']['#value'] = $form['visibility']['language']['negate']['#default_value'];
     }
 
     // Add plugin-specific settings for this block type.