Revert "v2"

This reverts commit 8871c0d03eb4344d4f8bb5a10ba7564d25e3f27f.

Conflicts:
	r1.txt