This reverts r260023.
thank you for fixing this. The changes look good to me, but it would be great if you could update the comments and possibly add 2-3 sentences in the commit message to make it easier for people to get the context of this change.
Maybe mention this in the comment?
The comment seems to still need an update.