Backed out changeset 5af48430563e (bug 1056128) for causing regressions