Comment # 7 on bug 69328 from Alex Deucher

I wonder if this may also be related to bug 69321.  Does reverting
f0435ebb07d01a77ca0d98967a002898811a5206 also help?