Revert change to subprocess patching in 3ccbf44