Can we somehow to follow here with SPR-11468 fix to get rid with similar code duplicate here and in the `MessageBuilder` ?