Fix bad merge: add back dropPartition.