Revert 54815 for 2.5.1 release. Can be applied after 2.5 branch is unfrozen.
1 file changed