Revert "Untested UUID Support"

This reverts commit 5344e02d44cfde6d4cde46b791316d50dcc0ec63.