7d4176bf73
This reverts commit 68fc44ffad.
Reason for revert: Wrong handling of events
Change-Id: Ic34916123ed6c4ba33f629549dda2cdbc890b413