Backed out changeset 364d6f79d87c (bug 1084177) for unified build and valgrind test failures