ooor not oops Revert "be gone all references to calendar"

This reverts commit a3badef578ebd0b33031340322a901c8bc385858.