Revert "Overlay changes"

This reverts commit a7a099f6b6b37db85adc020df08a8620e2d6c173.