Backout bug 899785 for talos regressions. r=sadness