Merge "Revert "Work around bugprone-exception-escape bug.""