Revert "Keith/Rex - Change terminate to poll for completion"

This reverts commit 0c3edf21a9641ec4ac2fb132c0223fba2123a52f.