fix(clustering): Use same codepath for single- and multi-node