Add TODO; don't pass scheme for service locations.