Revert Early version of new volume

This reverts the volume-related pieces of
commit 16fbd9dd1d2d407aa0bc096800af2630c218cde8.

Test: manual
Change-Id: I346c616697b155361a26ec0ca48e313e4a9353b1
Fixes: 62572865
5 files changed