NO_FLIST is not needed anymore