Pull in patch from upstream commit 68e77a2
Redo the patch:  upstream git diff didn't work
Update patdh header