Revert "going back to known working state after IPv6 broke some stuff"

This reverts commit d8d35f05139b1609182502eb755ac2d4092bace1.