Add back "ipv4" and "ipv6" formats but deprecated