Revert 2003-12-03 change, instead, provide the compiler macro for