Removed calendar hack added in 441a56e