Revert "Fixed a bunch of issues relating to the calendar not saving properly and erroring out. :)"

This reverts commit 1ed44a13771e3753e55e69aadff47ed0f2a2f6bd.