This reverts commit 38259afa8d. The change to an option wasn't yet incomplete -- that would require dynamic lookup of the value at the C++ layer.
38259afa8d