This reverts the volume-related pieces of commit 16fbd9dd. Test: manual Change-Id: I346c616697b155361a26ec0ca48e313e4a9353b1 Fixes: 62572865