This reverts commit 414042ad partially, which is required for testLegacySimulationPerformance
Attach a file by drag & drop or click to upload
