Revert "No Voice Punisher"

This reverts commit beba84309098cd3157694ca4d27f98ff93d673ff.
Revert "Revert "No Voice Punisher""

This reverts commit 18b32252c59d79f205cdf186ad3e8af8439bc84a.