Merge issue - Removed duplicate method from Emitter.