Revert "Cleanup."
Revert "Cleanup."

This reverts commit 97bd84aea1d6a7df16696d503d8a343c10287b47.

ehlemur/gtest-parallel,google/gtest-parallel,pbos/gtest-parallel,bbannier/gtest-parallel,greggomann/gtest-parallel,kwiberg/gtest-parallel