events: backed out commit 0397223

Related to #5970