Backed out changeset 633ff919c7f7 (bug 1002780) for tpn test failures