Revert "add workaround for NAT or tunnel access"

This reverts commit d6252cb3756b9eed42a24d5023876bd69e4f2ad7.