Re-enable old calendar for testing