Created a new branch bug-050ac21f72 out of the contributed patch
for later review.

Appears the branch doesn't build as is, but gives a good starting
point.