Revert "Fix up other exit points. Should stop process hangs for clean exits."

This reverts commit 5d6dc5dce37e488188d6fc468c16e8a6183a3610.
Fix Eclipse launching attribute