Reinstate X-Forwarded-For and StripQuery functionality in logger