MDL-40230 removed duplicate handler event entry