This is one of the performance-oriented changes from !100 (closed).
It was originally deployed in #40200 (closed).
