Revert "enhancement to speed up event#next_event_occurrence_with_time"
Merge pull request #542 from AgileVentures/revert-538-next_event_occurrence-fix

Revert "enhancement to speed up event#next_event_occurrence_with_time"