Revert "Event Handling Refactor"

This reverts commit 5270de57883a658548c9f60706b0bed2dc9118fa.