Reverted RetrievePropertiesEx change for now