Backed out changesets f0811650f2f7 and a67882c52c98 (bug 957790) for gtest failures.
CLOSED TREE