Revert "Make sure event handlers get cleaned up during parsing"

oops, I totally ignored the 'not ready for merge'. reverting