It's a backport, I don't care there since stable4 is dying and no-one will ever take a look at this code anyway ;-)