Revert "Cleanup (1/2)"

This reverts commit 9f061b0c6116e842ba958b0f5491e428a4e1ce15.
Revert "Remove overlay"

This reverts commit 769401bc29e5121f8220cd7b6e5fd733baa831eb.