Revert "More sound fixes"

This reverts commit 1c63464205c5fded6c3d7095e71d5599db954ddb.

Change-Id: I5b0e128022c40f58d4795d7b2899e327b8495a4b