This reverts commit 1dd72dca45. As pointed out in #27171, it would break compatibility with 3.1.0.
1dd72dca45
(cherry picked from commit 6280be46a6)
6280be46a6