Revert "Fix a number of issues introduced with the increasing volume setting"

This reverts commit 628e07a0eba31ca2a00b57c81665e4c31a64eae3.