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

This reverts commit c3567ddcf4c80e5630132490f87929709000c4d7.