Revert "file2"

This reverts commit a60f45ce827292f12a734851b8ff0cfab316e5b0.

Conflicts:

	test