Backed out changeset c345da3eef13 (bug 1058440) for regressions