Revert "Attempt to recover from test hangs better"
Revert "Attempt to recover from test hangs better"

This reverts commit d7a55026d9c3d62f2d0520e3b62b60d1938912c3.

Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code,Dart-Code/Dart-Code