Revert "Squash UMS Commits [2/3]"

This reverts commit add999c1aca7f7cb0b83130f1ca252fcce5bd114.