Backed out changeset 4f0d8916386e (bug 962791) for causing various regressions.