Work on bug #1162.. PP2 right now always dump the payload text/xml