[PATCH v2 2/2] Drop dependency on ipcalc