7b005bb9cf
This reverts commit e9bff5fe9f40d87b2164fc4f667f2cdd0afd4634. Failures were detected in Google tests due to this commit PR Close #37524