[1.6.x] Partial revert of commit 2bf403ecbd95

Homework: write 100 times geoapp is not geogapp.
Backport of 57815e2630 from master.