Revert "Option to disable safe volume warning [1/2]"

This reverts commit d9ba2ab4945a7c2ecae0165329eef0b8f025964f.

Change-Id: I1a044cc6760ae4f89c1bb3174768dd14b06e5219