Revert "Use decode-body more."

This reverts commit b7a9d723d020dec44ed7375978c1107559c57cb1.