Revert "cleaning up internal firing of event callbacks (make things clearer)"

This reverts commit 38ce01e02f2d986f97d5a2dc80ddf4ef26f773ad.