Revert "UMS removal by @Ryccardo"

This reverts commit a5dde33e3a99cf74590fd6d74e4f47c4caf5f16b.