Patch to remove the use of the UDID