Regression in d4ac23bee1. Thanks Omkar Deshpande for the report. Backport of fa0433d05f from main
d4ac23bee1
fa0433d05f