Revert "Merge pull request #689 from dumpdavidson/changeling_voices_squash"

This reverts commit 6206285633e29e125043fdb7576f4273dc85d407, reversing
changes made to 83a6ebfc95f90490257fae092c32b446465b9811.