revert [SPARK-2290] in master