Undo breaking change on listeners