Revert "overlay fixups part 1"

This reverts commit 1eb53a7cd13a35108784472f979f8dd2266da071.