Remove the -v1 switch and all uses