Making another clean build without subrepo