Revert "a=1 Merge branch 'br1'"

This reverts commit ef86494a0e67ccae7a2943d26bcd590f6dabff75, reversing
changes made to cc81b21d6c2584b22e4216f17b2b8d9c3cb86a8c.

Conflicts:
	test