DB-2175 revert back