Revert "UMS support with any volume, not only primary"

This reverts commit c0f94d65082cac2743d8f515c6a9b676aaf129e5.