Backed out changeset 6baeffddba47 (bug 1060279) for regressions