Oops, reverting CXX_FLAGS back