(cherry picked from commit f7a6ff6f

)

Co-authored-by: Brett Cannon <brettcannon@users.noreply.github.com>