Removes new event code and reinstates old event code.
Merge pull request #2298 from CIB/master

Removes new event code and reinstates old event code