Revert "This is a very large hopefully non-breaking refactor of the calendar helper."
Revert "This is a very large hopefully non-breaking refactor of the calendar helper."

This reverts commit d2d209f3b8fb289acd61ce208703cda4a35b35e1.

markburns/event_calendar,markburns/event_calendar