This reverts commit 15c873b486. This was causing infinite recursion when depending on nested options
15c873b486