Revert "Overlay clean-up (no longer applicable)"

This reverts commit 9368dffa0b4f47b9e83df3b1ed57709291b20867.