Don't drop the 7.24 defines if they are available