Comment 75 for bug 586910

As discussed in the other bug, bug 473093 is not related to this bug.

As things stand, awating further feedback, otherwise we can probably backport it some time next week.