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

This reverts commit 5df193c1c6c27d3082b07db5cb80afa68e8d7c6c.