Revert "v7"

This reverts commit f89cbeb07e165adcd682cc0686774aa09f056216.

Conflicts:
	r2.txt

a

a