Use IP CRCs instead of IPs

Pulled in from Caps