I can just put in a new pull request, just for this change.  It is not really related to the issue that this is supposed to resolve.