Revert XFF IP address selection change partially