Revert OptionHandlerFactory changes