Revert "For better UMS"

This reverts commit f5750e7bce4991e5432d4dfe4612b8eaf9ccb7a8.