Don't need our navigation and map_store forks any longer.