Revert "1.26 to 1.24"

This reverts commit bb91767a0a3f611f9477277e95df06445a984093.