Comment # 29 on bug 66932 from Alex Deucher

Created attachment 82563 [details] [review]
additional fix

Try just this patch on top of attachment 82560 [details] [review].  Do not apply any of the
debugging output patches.