Revert "HIVE-2584"

This reverts commit 9bfa7e31d087c422099a78d3f2d58f760565364c.