Revert "Feature 11002: Deprecate helmv2"