GitLab

This is the go1.21 version of
32bcc45c

As @tomo originally noted in his report, upstream the
patch was only backported to go1.22 yet not to older
go versions, hence the broken test also failed
there.