This is a partial revert of commit ed2b30dc. The changes outside of a new version of parallel broke several go packages.