Regression in 1699f8b52a. Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> Co-authored-by: Natalia Bidart <124304+nessita@users.noreply.github.com> Backport of 999ba9db6d from main
1699f8b52a
999ba9db6d