I am confused by the comment in the commit message which explains this change. It sounds like, although this change addresses the current issue, it might introduce other problems. If that is the case it doesn't sound like a good solution. I wonder if there is another way of addressing the issue without introducing this other problem. I assume the original code was written than way for a reason.