Revert "Collapse and expand header and payload"

This reverts commit fa2952bd086d31d5c444c52171c6b51fbd4b529b.