Merge "Revert "Apply IP blocks to X-Forwarded-For header""