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