Revert Options to support old version.