1 files changed, 2 insertions, 4 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index f1a8b579866..16369d82f9f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -90,10 +90,8 @@ public final class ClusterSpec {
      * are ignored.
      */
     public boolean satisfies(ClusterSpec other) {
-        if ( ! other.id.equals(this.id)) return false; // ID mismatch
-        // TODO(mpolden): Remove this after January 2019, once all nodes in combined clusters have type combined.
-        if (other.type.isContent() || this.type.isContent()) return other.type.isContent() == this.type.isContent();
-        return other.type.equals(this.type);
+        return other.id.equals(this.id) &&
+               other.type.equals(this.type);
     }
 
     /** A cluster type */