Revert "Attempt to fix #613"
Merge pull request #623 from Unitech/revert-621-ghost-processes

Revert "Attempt to fix #613"