Remove upstream_servers hack