Reverted the change for format. DHH-259