This was introduced by the IEEvents patch, if you can find the commit where we have apply the patch I can do a rebase, and merge the commit patch with this small change.