Revert "More sound fixes"

This reverts commit 1c63464205c5fded6c3d7095e71d5599db954ddb.
Revert "Revert sound commits"

This reverts commit 12aa8ec3f10f3e241861c0fab2c58c81e2706dfa.