Revert "Merge branch 'feature1'"

This reverts commit b59242bd7f4a970b346e8e52e773c4b723923e7d, reversing
changes made to 97b8f7c65337b86dccd94247bba78b36fe88a007.

Conflicts:

	file4