Committed revision 741.
I am leaving such v2 artifacts as the #if 1 in there for now. It is a
marker and I want to leave the markers there in case we hit a problem.
It was there for a purpose-- we just don' tknow what it was.