revert change to generaloption, should be done in vsc-base/separate branch