I now see that this bug has already been fixed in upstream version 4.4: http://bugzilla.mindrot.org/show_bug.cgi?id=1221