Remove the define, revert back to numbers