[SPARK-9352] [SPARK-9353] [HOTFIX] Reverts PR #7668 on branch-1.4#7686

liancheng wants to merge 2 commits intoapache:branch-1.4apache/spark:branch-1.4from

liancheng:hotfix-revert-pr-7668liancheng/spark:hotfix-revert-pr-7668Copy head branch name to clipboard