Revert to using event objects