Revert "Made event handler more generic"

This reverts commit 00c4a87f2247e3bbf7bbc89960384e4ec161de56.
Misc