While usable for my purposes, that patch needed just a little more work to
be usable for upstream, so use the patch I sent them.