[1.6.x] Partial revert of commit 2bf403ecbd95
[1.6.x] Partial revert of commit 2bf403ecbd95

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

felixjimenez/django,felixjimenez/django,dex4er/django,dex4er/django,dex4er/django,django-nonrel/django,redhat-openstack/django,django-nonrel/django,django-nonrel/django,django-nonrel/django,redhat-openstack/django,redhat-openstack/django,felixjimenez/django,felixjimenez/django,redhat-openstack/django