Play nice with bacon

Change-Id: Ib8321d438887a36082464956abab8239828846c1