Cleanup: we were accidentally killing ourselves (bad idea)

Refs #4717