Revert "Bye bye Overlays"

This reverts commit a94f16432d45228db7b4b9e7730e44603c875bdc.