Fix bacon

Change-Id: I778bc615bec75e7250a4a44952057486c8348dbc
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	core/Makefile