18.0 seems to be doing a different thing with REMOTE_ADDR. Putting this back to the last working version in production.