Revert to not using subprocessing