Revert 75a8c2d..4e26be6

This rolls back to commit 75a8c2d0ae5a1cba1aaac577bd112b800da86d31.
Revert "Revert 75a8c2d..4e26be6"

This reverts commit 982f1c67ead42b7770d8a56e3ab068215eb5254d.
current event passing seems to be working