Reverted changes to GUID constructors