This can be removed entirely, it was only used for the old message.