Revert "Merge branch 'branch_flaver'"

This reverts commit 5021dbc6bb9de3a03bcc068a556cf2ada6b56c78, reversing
changes made to 2925c4af2a12d6b655ced9a244580a8c9df8a011.