Revert "HAS / NOTHAS cbs calendar update"

This reverts commit 60fe0592923daf10eede37983e289c474694e888.
Revert "fixed"

This reverts commit 1f00546c879e06d02260d0fb051f17dbc1e91f39.