Apply this change from 2.6. Hopefully it doesn't cause a conflict.

I really want to test the buildbots.  This change is necessary
to get the test to be more stable and not crash due to previous
processes exitting.