Backout 85d108f0b422 (bug 874369) for causing b2g reftest failures.