Fix #2767 for the new geo traversal code as well.