975917bafd
This reverts commit 2bb9a6535115ad8ba3c56781a4fe4141936cefe6. It breaks tests in google3 which rely on the error handling behavior. PR Close #31918