Revert "Use IP CRCs instead of IPs"

This reverts commit 50a5e4daaf900e57a2d9b478e0be51cc9f4e451a.