Work on issue #245 - make event rollback feature work again, and test for it