DB-2175: revert old patch and added new one