bacon: Revert ULL feature for now

 * There are a bunch of issues with this feature currently.
 * Will revisit later.

Change-Id: I34bfee0cd9e7cf7f1252a1b092477f7f3eaeb1df