Revert "Merge pull request #24 from jirwin/jirwin/fix_parallel_bug"

This reverts commit 65c00fae304a6bd18a93c0df503c2ff41a186afd, reversing
changes made to 2d56be2ae1faabad08e323118042d1824950a9e1.