This reverts commit ee50590e. PR43855 reports a performance regression from this commit, which I'll look into.