Back out 4f2f5c15e065 (bug 652510) for regressions