HIVE-7334: revert last commit