I think we have to "fixme" the original commit on not adding the numbers to the messages. You can do that at mwr:81074 (which already has been marked fixme, by the way for another issue.
