Revert "Squash UMS Commits [3/3]"

This reverts commit 0a13e4142afa7b681390cc1a9fe643d32eaabda6.