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