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

This reverts commit 20e8b90d78725f0c742ffc35a4e6e2ff3072d92c.