revert draft spec -> message spec