How did this end up in this PR?  It might be a good fix, but doesn't really relate to this change, so perhaps deserves its own PR.