Revert "Move Calendar to JBMP"

This reverts commit 21c9adb46b6eb5e203a46c93aff3ee7617f2e4cd.