HIVE-8536: revert unnecessary changes