revert event handling changes