Revert 79f3b55..f210c0f

This rolls back to commit 79f3b5503736fcaa9180cd76d021052a2bd95cc0.
Revert "test commit"

Conflicts:
	test.txt
Revert 5f1a249..dd713d7

This rolls back to commit 5f1a249d3c16ad5f9132e3b29684fe32a98ad8a9.