Revert "5.24"

This reverts commit 4d571e786c01d01a2cebff4dd5f22e9a36e91296.