Play nice with bacon

Change-Id: I85e6c91b64a582648db2a2a04e828514c721dbdb