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