Revert "Revert "Reverse volume keys""

This reverts commit 1db8ee37a1bf261024efa816ab4f708d05e86338.