To revert to 1.5 behaviour we need to consider untagged instances if no clusterID has been specified or found.