HIVE-8972: simplify