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