Thanks Keryn Knight for the report. Backport of 394517f078 from main. Co-authored-by: Adam Johnson <me@adamj.eu>
394517f078