Update to use 2.6 backport