Navigation: Revert to using location as much as possible