It removes the "wait-until-event-thread-stops" logic, which makes TestDiagnosticReporting.py flaky. This reverts commits 09ff41a0 and acdd41b4.