Get rid of old hack for 2.6