This reverts commit e7d8464f87.
Fixes #40508 regression.
This will be re-applied and the regression fixed for a future 3.2.x release.
This reverts commit e7d8464f87.
Fixes #40508 regression.
This will be re-applied and the regression fixed for a future 3.2.x release.