Revert "JK: Fixing the calendar grouping logic."

This reverts commit 013a95299a1af250dd8cbe695bf90ca9f10864f1.