Re-enabled an optimization in finding the nearest date