Remove bad 1.6 handling