Update to handle prescence of server-side GeoIP