HIVE-7624: don't overwrite HIVE-7597