Backed out changeset 78c3801aed19 (bug 825329) for intermittent orange.