CC-5283: Calendar gets messy, possibly after upgrade