Back out uninintended voter change.
Merge branch 'master' into ENG-5135-refactor