Support previous MACH_CODINA code
Use ifdefs to keep code present in ACE 2