Rolling termination working.  Fixes #8501.