Revert "Legacy UMS path"

This reverts commit d96a7056348bb05542647d206163e6f9c63d3c19.