See #3377 and related commit: 0d0afdb This will take a bit more then simply then cherry-picking due to differences in Geo related classes on the two branches.
