Revert "Legacy UMS path"

This reverts commit fb5da88e6ca4a1c18cb9dfc91001d0a001e3cbe2.