Revert "Implemented optimizations on the haversine distance; timing now shows 1.82us / loop, down from 4.8us / loop."

Timings not yet right, so reverting for now.
This reverts commit 36ec6dcfac616bb6f5381e0bfecde55e3ac774c1.