Revert "tweaked event tracking"

This reverts commit b3890af4ae33b2c1a2043f2dc4235b9f5711d22c.