Revert "Fix UMS build"

This reverts commit 5a90aa3d63c70b7ba5116039a09c7b416567dda2.