revert [SPARK-2324]