Revert 54813 for 2.5.1 release. Can be applied after 2.5 branch is unfrozen.
2 files changed