fixes: #3017
Moving it from headers to body (and leave as a dict) makes more sense here.
@julian8628 I've created #3022 for moving it to body.
Pull-Request has been closed by julian8628
fixes: #3017