Fix errors from rebase by eliminating forced stop code for now.