Revert "Merge branch 'br3'"

This reverts commit d8f699deef73ed2b37fd598e45c6ece45227aa39, reversing
changes made to 07fd8722112b61f7d55a36390ebb14bfce00f31b.