Revert remaining cruft from pipelining changes.

After this commit, the pipeline option affects only the shuffle
read (de-pipelining the shuffle write led some queries to hang for
unknown reasons, and wasn't useful anyway from the perspective
of comparing to Hadoop).