Revert "Merge "Port volumes swap to the new API-v3""

This reverts commit 312c1fde2e63b93519f99242c4922538f4c4e741, reversing
changes made to 0ee03b07305d7d0e6c910579e8c66d53741cf9c0.