Comment # 14 on bug 1225147 from llyyr

Gave 6.10-rc1 a shot, got a freeze within minutes. The patch still workarounds
the issue though.