diff --git a/core/lib/Drupal/Core/Entity/Plugin/Condition/Deriver/EntityBundle.php b/core/lib/Drupal/Core/Entity/Plugin/Condition/Deriver/EntityBundle.php
index 7162526da5..b4f180d9b0 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Condition/Deriver/EntityBundle.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Condition/Deriver/EntityBundle.php
@@ -53,8 +53,8 @@ public static function create(ContainerInterface $container, $base_plugin_id) {
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // @todo Stop excluding node_type once
-      //   \Drupal\node\Plugin\Condition\NodeType is removed.
+      // @todo Stop excluding node_type once https://www.drupal.org/node/2914188
+      //   is in.
       if ($entity_type->hasKey('bundle') && $entity_type_id != 'node') {
         $this->derivatives[$entity_type_id] = $base_plugin_definition;
         $this->derivatives[$entity_type_id]['label'] = $this->getEntityBundleLabel($entity_type);
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Condition/EntityBundle.php b/core/lib/Drupal/Core/Entity/Plugin/Condition/EntityBundle.php
index 61969236da..b0c77c40aa 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Condition/EntityBundle.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Condition/EntityBundle.php
@@ -59,8 +59,8 @@ class EntityBundle extends ConditionPluginBase implements ContainerFactoryPlugin
    */
   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->entityTypeManager = $entity_type_manager;
+    $this->entityTypeBundleInfo = $entity_type_bundle_info;
     $this->entityType = $entity_type_manager->getDefinition($this->getDerivativeId());
   }