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