Revert "net: ipv4: merge derp fix"

This reverts commit eac3e9a85fb54b5cd2f05db04b93ca5e004b7049.

Change-Id: If54d4245029094ee75d03d72380f7acfeb6d01a9