The changes in !52397 (merged) caused a number of unit tests to fail, so this change partially rolls back the changes so that they now only affect simulation jobs.
The changes in !52397 (merged) caused a number of unit tests to fail, so this change partially rolls back the changes so that they now only affect simulation jobs.