Fix for new cluster-assign-roles.sh behavior