[FIX] Calendar - revert commit from forward port 9354. This has been already fixed in 9322.