Revert "Merge with upstream v2.6.x"

This reverts commit 0d7f7a9626e6f2d8a6fac1d2d7e5006ed71dba2d.