Revert "Revert "Removing overlays""

This reverts commit b100682ce598180b9a183a243a801e9beab32f6c.