Backout bug 945192 for intermittent failures. r=rstrong