Andy Wilkinson 68e5a107cc Revert "Merge branch '2.4.x'"
This reverts commit 5488b8cb465b6aa45a1a807f7754ca32132b8ed1, reversing
changes made to dee0df5c53dba81fca08bc64479fc9e54434a9ac.

See gh-25701
2021-03-17 11:17:54 +00:00
..
2021-03-17 11:17:54 +00:00