2.5 Fix regression with format specifiers

If you like, I can fast forward 2.5 with this