Revert "cleanup overlay. This goes in common"

This reverts commit f0f68e0c61d5657e85732b548916ad925d05b4ba.