I've been using the grep-use-headings locally for a long time and it
works well.  Should the the patches be installed?