Revert "Set final state to STOP instead of TERMINATE."

This reverts commit c2e066fc9233639f7a2b966eea3036835975d256.