Backport of 00b0786de5 from main. Regression in 466920f6d7.
00b0786de5
466920f6d7
'%s' % value
str(value)