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

This reverts commit fc1e5a5be636f5e8803b572b276d6e939e47df44.

Change-Id: Icf0c5134d9eec460b29dae4ccd65839096b86fc5