This reverts commit 627aaa88.

Well, we do need to define the type first. Limitation of how we declared events.