Revert "Revert "Overlay clean-up (no longer applicable)""

This reverts commit d92370389934461b0f93408ac8951086ef58e8e9.