No longer store the calendar_id on the resource (unintentionally); keep it volatile instead to avoid conflict errors creeping up.