Revert "Revert a bunch of sound commits causing audio issues"

This reverts commit 6b42f5e54aaa744086e6a6abdad1e1f4b18ad91d.