revert back and simplify event polling changes