[SPARK-3481][SQL] removes the evil MINOR HACK

[scwf]

a follow up of #2377 and #2352, see detail there.

[SparkQA]

Can one of the admins verify this patch?

[marmbrus]

ok to test

[SparkQA]

QA tests have started for PR 2505 at commit 4874ec8.

• This patch merges cleanly.

[SparkQA]

QA tests have finished for PR 2505 at commit 4874ec8.

• This patch passes unit tests.
• This patch merges cleanly.
• This patch adds no public classes.

[SparkQA]

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/20690/

[marmbrus]

Thanks! Merged to master.