Comment out macro that is not being used and is conflicting with a global macro - causing build to fail