Backed out changeset 36bfb1d8b8fe (bug 1010655) for Cpp test crashes.