Sure, but we should probably do this with the cluster init refactor (if there are more changes to make).