Regression - Diagnostic export broken again in v1.7.0b3

[folfy]

@KartoffelToby Did you check this change for regression? As commented, I specifically commented this out, to fix diagnostic data export, which seems to be broken yet again.

Originally posted by @folfy in 9bcac87

Original PR for fix: #1526
Original issue in v1.6.1 and v1.7.0b1: #1469