Instead of a backport for cef916, this change simply undoes the optimization that led to the regression. Closes gh-30314