(cherry picked from commit 4aa296f9c4) Co-authored-by: Steve Dower <steve.dower@python.org>
4aa296f9c4