Bring back NAT traversal that got mistakenly pulled out by CVE-2014-2037 patch. Patch by Thomas Geulig