Revert the use of text_format for config
Fix message token test.