Comment 10 for bug 1756915

The further patches I want to upstream need another round of polishing and re-submission until they can be accepted.
Since this one is crit hitting so many people and the changes are backports-only (nothing that becomes a maintenance burden) lets unblock this issue by pushing an interim version through regression tests and upload it once good.