Comment # 4 on bug 58354 from Alexandre Demers

Hitting some other bug right now with bug 58655. I'll apply the proposed patch
for the other bug and I'll see what I get then.