Switch back to the prev eventemitter

Hoping to fix travis