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