Revert some no longer needed local CFLAGS modifications.