Revert some event changes that broke tests.