Undo volumes stuff (will be in a separate review).

Change-Id: I3467ba037283ce51f2bcdb9086acab4b290026a1