No more bacon

Change-Id: I2d61af4e4af7482eea8cfe824a585469248edc12