Put back one piece from 22f3b9a into BlockDist.chpl.