Patch to support removing the seperation of head and body content