Unfortunately, in #23094 the assumption that #14336 makes comments outdated is wrong. As pointed in #23094 (review), the #14336 just moved the relevant code a few lines down.
This PR reverts commit ee7891a0c412728cf8bec667f25263682a9baaaf, and moves the comments into the right place.
I apologize about that.