Revert event move

Previous commit 6389376d caused too many issues and doesn't reference what it was trying to fix. So it's safer to revert than to try and keep it.

Fixes #3036 (closed)