BTW, I'm not saying that this problem (if it is a problem) was introduced with this PR. But maybe it just makes it that much more important now.