Might as well do it for IPv4 too

While we're at it.

Probably best to cherry-pick this individual commit into your branch instead of merging this pull request, to keep the history a little cleaner.