Let geometry retrieval to be optional

2 jobs for remove-geometry-storage in 5 minutes and 18 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed linters #80826

00:05:18

passed tests #80827

00:05:09