Revert "Legacy UMS path"

This reverts commit 1482c2867460281008d2b177cb4a643a6c4a761b.