Enjoy our own bacon

Change-Id: Id6d1c9ba8142ac79b66b97960a76d75b01dd759a