Comment # 2 on bug 69671 from Alex Deucher

Possibly related to bug 69675?  Does reverting
e6e792092e816bea0797995c886fb057c91d4546 also fix the issue?