Revert "enhancement to speed up event#next_event_occurrence_with_time"