Revert "Bye Bye Overlays"

This reverts commit c8a98cb2e85b9ceb3614f80d240b4b56843ed369.