Comment 30 for bug 1688508

The further patches I want to upstream need another round of polishing and re-submission until they can be accepted.
But this one only has accepted changes, so lets unblock this issue by pushing an interim version through regression tests and upload it once good.