Bug 938359 - Back out changeset cc298e4b0f47 for regressions (a=backout)