Comment 2 for bug 1907421

Trying to cherry-pick 7d6e1329652e from focal master-next or groovy master-next ends up with a significant merge conflict.
I guess proper backports are needed and should certainly be addressed via upstream stable, since it's all common code and that would address the maintenance burden for the changes and lower the risk.