Introduce and use DeprecatedFileOutputFormatWrapper