diff --git a/ctools.module b/ctools.module
index ec4daba..2131f91 100644
--- a/ctools.module
+++ b/ctools.module
@@ -1,5 +1,8 @@
 <?php
 
+use Drupal\Core\Entity\Plugin\Condition\EntityBundle as CoreEntityBundle;
+use Drupal\ctools\Plugin\Condition\EntityBundle;
+
 /**
  * Implements hook_theme().
  */
@@ -61,4 +64,12 @@ function ctools_condition_info_alter(&$definitions) {
   if (isset($definitions['node_type']) && $definitions['node_type']['class'] == 'Drupal\node\Plugin\Condition\NodeType') {
     $definitions['node_type']['class'] = 'Drupal\ctools\Plugin\Condition\NodeType';
   }
+
+  // Replace all generic entity bundle conditions classes if they are unaltered.
+  foreach ($definitions as $id => $definition) {
+    if (strpos($id, 'entity_bundle:') === 0 && $definition['class'] == CoreEntityBundle::class) {
+      $definitions[$id]['class'] = EntityBundle::class;
+    }
+  }
+
 }
diff --git a/src/Plugin/Condition/EntityBundle.php b/src/Plugin/Condition/EntityBundle.php
index 57547f3..72f76db 100644
--- a/src/Plugin/Condition/EntityBundle.php
+++ b/src/Plugin/Condition/EntityBundle.php
@@ -2,131 +2,14 @@
 
 namespace Drupal\ctools\Plugin\Condition;
 
-use Drupal\Core\Condition\ConditionPluginBase;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\ctools\ConstraintConditionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use \Drupal\Core\Entity\Plugin\Condition\EntityBundle as CoreEntityBundle;
 
 /**
- * Provides a 'Entity Bundle' condition.
- *
- * @Condition(
- *   id = "entity_bundle",
- *   deriver = "\Drupal\ctools\Plugin\Deriver\EntityBundle"
- * )
- *
+ * Extends the core entity bundle condition.
  */
-class EntityBundle extends ConditionPluginBase implements ConstraintConditionInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The entity type bundle info service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
-   */
-  protected $entityTypeBundleInfo;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeInterface|null
-   */
-  protected $bundleOf;
-
-  /**
-   * Creates a new EntityBundle instance.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
-   *   The entity type bundle info service.
-   * @param array $configuration
-   *   The plugin configuration, i.e. an array with configuration values keyed
-   *   by configuration option name. The special key 'context' may be used to
-   *   initialize the defined contexts by setting it to an array of context
-   *   values keyed by context names.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, array $configuration, $plugin_id, $plugin_definition) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityTypeBundleInfo = $entity_type_bundle_info;
-    $this->bundleOf = $entity_type_manager->getDefinition($this->getDerivativeId());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('entity_type.bundle.info'),
-      $configuration,
-      $plugin_id,
-      $plugin_definition
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $options = array();
-    $bundles = $this->entityTypeBundleInfo->getBundleInfo($this->bundleOf->id());
-    foreach ($bundles as $id => $info) {
-      $options[$id] = $info['label'];
-    }
-    $form['bundles'] = array(
-      '#title' => $this->pluginDefinition['label'],
-      '#type' => 'checkboxes',
-      '#options' => $options,
-      '#default_value' => $this->configuration['bundles'],
-    );
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['bundles'] = array_filter($form_state->getValue('bundles'));
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    if (empty($this->configuration['bundles']) && !$this->isNegated()) {
-      return TRUE;
-    }
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $this->getContextValue($this->bundleOf->id());
-    return !empty($this->configuration['bundles'][$entity->bundle()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    if (count($this->configuration['bundles']) > 1) {
-      $bundles = $this->configuration['bundles'];
-      $last = array_pop($bundles);
-      $bundles = implode(', ', $bundles);
-      return $this->t('@bundle_type is @bundles or @last', array('@bundle_type' => $this->bundleOf->getBundleLabel(), '@bundles' => $bundles, '@last' => $last));
-    }
-    $bundle = reset($this->configuration['bundles']);
-    return $this->t('@bundle_type is @bundle', array('@bundle_type' => $this->bundleOf->getBundleLabel(), '@bundle' => $bundle));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return array('bundles' => array()) + parent::defaultConfiguration();
-  }
+class EntityBundle extends CoreEntityBundle implements ConstraintConditionInterface, ContainerFactoryPluginInterface {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/Deriver/EntityBundle.php b/src/Plugin/Deriver/EntityBundle.php
deleted file mode 100644
index 073ab4a..0000000
--- a/src/Plugin/Deriver/EntityBundle.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-
-/**
- * Deriver that creates a condition for each entity type with bundles.
- */
-class EntityBundle extends EntityDeriverBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($entity_type->hasKey('bundle')) {
-        $this->derivatives[$entity_type_id] = $base_plugin_definition;
-        $this->derivatives[$entity_type_id]['label'] = $this->getEntityBundleLabel($entity_type);
-        $this->derivatives[$entity_type_id]['context'] = [
-          "$entity_type_id" => new ContextDefinition('entity:' . $entity_type_id),
-        ];
-      }
-    }
-    return $this->derivatives;
-  }
-
-  /**
-   * Provides the bundle label with a fallback when not defined.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type we are looking the bundle label for.
-   *
-   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
-   *   The entity bundle label or a fallback label.
-   */
-  protected function getEntityBundleLabel($entity_type) {
-
-    if ($label = $entity_type->getBundleLabel()) {
-      return $this->t('@label', ['@label' => $label]);
-    }
-
-    $fallback = $entity_type->getLabel();
-    if ($bundle_entity_type = $entity_type->getBundleEntityType()) {
-      // This is a better fallback.
-      $fallback =  $this->entityManager->getDefinition($bundle_entity_type)->getLabel();
-    }
-
-    return $this->t('@label bundle', ['@label' => $fallback]);
-
-  }
-
-}