undo the butterbar change, because automerger is ruthless

Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
2 files changed