Revert "Clean up previous commit to not require an Option"

I made a mistake and included some submodule weirdness.
About to re-push the patch without that.

This reverts commit 17ea548275364fac7cb5adbdc442010d1ba0d38d.