Revert "Merge remote-tracking branch 'UMS/master'"

This reverts commit 5c3d6160f0c7b899b6a5692bd9bb0460f1380f3f, reversing
changes made to 743e4add4f4d83a0faf8eed8c93804dcbb775a7f.