This reverts merge request !43857 (merged) as it changes output in a way that may affect reprocessing.