Caused TestShell to hang. Reverting for now. This reverts commit dced02ad9ff647118a830e10b3628a4687754a72.