Revert defines.h changes