Undid convertion to pure UUIDs