Backout bug 886164 for B2G regressions.