Revert "UMS support with any volume, not only primary (2/3)"

This reverts commit a280de37f08b1395938989fcc417bac06aec00b9.