Move geometries out of services. [Fixes #75388674]