Keep the define around as that is a good idea