Separate the geoip/endpoint conjoined twins monstrosity.