Revert "[mr2595] Calendar: small code simplify. no changes"

This reverts commit f67a9918578eadfa8743a0d6463eb0ea1ecf06e2.