UDID patch

I'm withdrawing this request and replacing it with a slightly newer one.