Revert "More volume experimental"

This reverts commit b5a066a1342910d13e8ae7eedfa30319f2b75699.