Use v2 by default

Is this really the only necessary change to make v2 work?