Revert XFF IP address selection change partially
auto-merge staging into master