Reinstate reverted commit 074de09767ce67a614264b25f35daabb1a9518aa Since merged PRs can't be reopened, using this to track for the 2024.0 release train. cc @LiRuihaoA We will need to document the error handling differences or come up with a way to work around them