Get the message format right for this case too.
Merge bug26354
stable to default