DB-1933 revert back patch