revert to use make_cvs instead of make_git