Comment 24 for bug 585092

The patches referred to above have just been reverted in upstream as they seem to introduce regressions including hangs.