@jasonsanjose I was also seeing the behavior get worse, but I backed out this latest commit and it was about the same, so it seemed to be caused by some external factors and not this particular change. And today, it seems better again. (sigh)

I also noticed some conflicts with your other PR (#7008), so I'm wondering what you think should be done with this PR?