Fix bug 883950 - r=gnarf

Closes gh-10648