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