Revert "Bacon - Another fix"

This reverts commit bb5c31858885dd1d3e0abf201a2a7cce76cc5d4a.

Change-Id: I63ff936c9b431c02fc40e65aef76c0d6c29a3093