HIVE-7773: more refactor