Revert "Merging Latest with New Sound"

This reverts commit 78e0c3074e39c6c0b333a6a02b81e858564dfb82, reversing
changes made to e8122b004891e49110a08f85c75f17d0ae7a188c.