Revert "Extending existing implementation, EventCollector implementation is still faulty."

This reverts commit 0eb9a550edffaa0e48d471523252ba83e74d5f11.