Branch for 2nd try at V2 removal

[SVN r77497]