Update to use our patched version of event_emitter