Simplifies the code by removing condfitional section that is no longer necessary.
Simplifies the code by removing condfitional section that is no longer necessary.


obruns/gtest,obruns/gtest,obruns/gtest,obruns/gtest