pjs/grendel/contrib/edit_from_header_directly.diff