backout dfc04fd0a41f (bug 1002814) for gtest breakage