Revert "Merge branch 'test2'"

This reverts commit f6f7618c88b3e8318bef9ae2bf7f467e7a9b56c8, reversing
changes made to bd5febe4941e5a20e4e27df1e3e0baba0d176bbc.
f7
f8
Merge branch 'test2'
clear
f1
f2
Merge branch 'test3'
f4
clear
f1
f2
f3
Merge branch 'test4'
f4
f6