This is a new attempt at fixing #12951, since the original fix caused regressions (see #20211).

Comment From: bclozel

A second attempt is ongoing, see #20290.