Revert "fix the event firing"

This reverts commit 46a076fcf096b93d779128e13593b7eb5c65b4f7.