Dropping support for 2.6