Rebased to AMPLab master

Reverted troublesome SHARK-92 commit -- still working with Reynold to figure out whether this is his problem or our's.