Back out 12f538f501b9 (bug 790765) for intermittent failure