Revert "Event compatibility"

This reverts commit 5d63c5876d146881f2839b1a88ee252d1f99f9b7.
Revert "Revert "Event compatibility""

This reverts commit 0c2a1b52e2529e67942adb950f50ac75a9b5976b.