Comment 82 for bug 1304001

It is now in mainline, commit fd8b79511349.