Revert "Bacon: Overlay"

This reverts commit 7ea7704ac2347477616b6fe2d9add70e4f27b707.

Change-Id: I8783cc2c8032529d8fc232968cd025c4aaf1e07e