This reverts commit 5d74c43511. The gtest tests appear to be flaky, and are failing in various places.
5d74c43511