Revert 8b06f1f..1842a38

This rolls back to commit 8b06f1ff8fa80c5621cdbae8d235f2e66fb60b08.
Revert 1842a38..9557feb

This rolls back to commit 1842a385850ce95170c8e62f27bbf89b76faf294.
Audio adjustments