Revert "fix HIVE-8537"

This reverts commit fc28618c1dc6502399edbb1ccf78f0e047b5f77d.
Revert "fix HIVE-8537"

This reverts commit 0c2b187390a10c8cc05a06330fd97d8f51f3f389.