Revert "Improved EventEmitter"

This reverts commit 13fcafe9c5efbf88ffc00818bbd09459dd333ae0.