Backed out changeset d15632d88126 (bug 933313) for cppunit testfailures on a CLOSED TREE