Revert "Revert sound commits"

This reverts commit 12aa8ec3f10f3e241861c0fab2c58c81e2706dfa.