Revert back commit 28967, it fixes registration for some users with symmetric nat