This change should be done by another commit, because it is not related to clustering.