Revert lat/lon fix as it requires further work.