Revert back to using UUID so that app doesn't break for existingusers