The issue seems to be fixed now that the fix for bug 92122 has landed. Sorry
that I wasn't able to bisect or apply a patch. Didn't want to figure out how to
do it.