Revert "Added support for early termination" for the sake of the pull request

This reverts commit 4c068ae1e614f0cbadac9b204867a7f7c1f3fa67.