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

This reverts commit 98c6d2e925212c15af98082aea3a737ce6d65e27.