Revert "Fix #157 "Can't switch to any event year after...""

This reverts commit 7dfc9b9454b9c283ddbb393c265f689119d6c910.

Moved this commit to branch fix_157 for a separate pull request.