Revert "Revert "Fix bacon""

This reverts commit 5c3a88cdeeddd9c589fe9fd9091ef77e29c12507.