Revert "gain sound control 3.6: merged with faux changes"

This reverts commit 205b0ea3880e9fbae024d40000bc34133e421f3b.