Extracted the necessary patch to fix PATCH and added to the patches directory.

I'm not making that commit message up!
Applied patch-body-support.patch to working directory