Manual cherry pick
The pid lives in connection now