Regression: Fix Geonotahack

Introduced by I6506fbd2232acd75400688eb1e4be1461d834f5b

Change-Id: Ifdcb8137d90112a7eb5d08f0b03b0b7867ecb0bd