Get rid of 5.10 hack