Revert change to NO_TERMINATION_CHECK

Reverts commits
c8ec46b16ce95438a4c51f74be74cdc445b50cbc
074642a69a0167d0f70dd5b0979bfd8a2f0dbc23
4a7b4925f49ac47d662ef9c017682486df9c92e2
cab731d48da9d5018f5d2a72264ea847b8b73638
a8afb2bbb762d1c866d72fbaaf74d857a7f21de7
fffc10662a015e5fdcd6e0446fcb04ff38682e91