Revert "Merge pull request #16183 from mcav/alarm-volume"

This reverts commit bb7e44e428640f15e1c07b0ab89c712e797fb9ea, reversing
changes made to 6274b3645b3d41df4aa5a55398b5d106edf1c528.