Revert "Merge branch 'sound' into nightlies"

This reverts commit f75f4838e28709f746115ead2aa6c584323d4ff2, reversing
changes made to 7f7c0eb8329957b308ac49327805829a503c7fdc.