Back out b157f5d0c235 (bug 974197) for b2g reftest-4 and reftest-6 failures
CLOSED TREE