Comment 3 for bug 1349018

fix committed to rev 13491.
I believe this fixes the original bug report.
It does not fix the problem mentioned in comment 2, not sure whether to split this out as a separate bug issue or not.