No need to get all fancy with messages. Let's stay simple for now.

This reverts commit c3087825880d5d70e0f1b16d83beedaf2181c524.
Reduces the header size for messages