Backout changeset d2fda338874d (bug 784591) for causing bug 832571 again