Regression in b47bdb4cd9. Thank you Giannis Terzopoulos for the review, and Tom Carrick and Sarah Boyce for the review. Backport of 679d57816d from main.
b47bdb4cd9
679d57816d