Revert "resolve and validate overlay options sooner"

This reverts commit a613bfd7908456b412b3b42a94597c99be41f7c2.