Geo portion of https://gitlab.com/gitlab-org/gitlab-ee/issues/4149

Solved by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3795

This issue serves only as a placeholder for tracking purposes.