Regression in 981a072dd4. Thanks pirelle for the report. Backport of 0393b9262d from main
981a072dd4
0393b9262d