Revert "Split CalendarItems from other Items."

This reverts commit 94d5a09e2f4d1f0472dba8c53bdfcbb0be9d647d.