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

This reverts commit 86e35da19a130fd870b7b4db6d9afb626b8cbe4a.