Partly revert commit 4c45712f
Merge pull request #311 from bcyrill/ipv6_newwanip

Partly revert commit 4c45712f