Backed out changeset 36a60b15c104 (bug 1049109) for gtest failures on a CLOSED TREE