revert changes to event dispatching

...o bubbleUp and self to speed up dispatch"

This reverts commit 455aaa4255a6905be4a88c07670ae8f7cba643e9.