> Oh in that case, would you like me to close or modify GH-17311? I didn't think you'd approve of making the more extensive changes all the way back to 3.5.

After reading the comments here I think Antoine's solution makes sense. But... let's wait a bit to see what other people say.  My comment is just a single +1; maybe Andrew, Nathaniel, or Guido have arguments against it.