Revert "[BUG #8277] track and trackend events will be fired on wrong target"

This reverts commit 1ad5695cacd26925b4e88cfb23e76d1feec47fa5.