Revert "Make sure stop process times out"
This reverts commit a9e6ffd39c1693c0dbbdc047e6458c56e432bd39.
[finished #61482460]
Auto-merge remote-tracking branch 'upstream/master'