Merge "Don't kill a new process for the sins of an old process."