DB-2175 reverted for 0.98