drop some 2.6 hacks
drop more 2.6 hacks
Merge pull request #6573 from Carreau/drop-2.6

Drop some 2.6 workaround.