Calendar hack on ismael's twist-nightly branch