Revert "try another mad idea for UMS"

This reverts commit 84d7c42b3805af83b34614da4fe0b978fa395029.
back to sane state