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