Backed out changesets e06db531baaa and 0f1658d37a86 (bug 840315) for B2G reftest failures. a=backout