Backed out changeset 463fa756b43b (bug 886110) for causing various regressions.