Fixing it incremental. This is a duplicate of IPv4 code.