Comment 9 for bug 1354109

Any solution to this will be done upstream first, so it would be better to
discuss it in the upstream bug, not in this bug.