cleanup that volume hack

Change-Id: I1550b14d747464752234ba60df7ff73dd84a7276