(#1606) - switch internal 'event emiter' to use the real one now that we have it