[DF-3272] Reverted changes with Format()