Revert "Merge branch 'hv/cvsimport-tests' into next"