Revert "Removed the need for client IP address"

This reverts commit dab6efe04c679caf2c04c08c1d1d0a767622bab4.