Fix bug 883950 - r=gnarf

Closes gh-10648
(cherry picked from commit cee375743267335a4590cd4ba93b9129a179166d)