GPII-752: Remove listener missed out on with merging.