* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164': undo the butterbar change, because automerger is ruthless
This commit is contained in:
* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164': undo the butterbar change, because automerger is ruthless