Revert "2.6 only"

This reverts commit 2a99621dfaad585fd94c6489f45598394b1dca92.