HIVE-7624: revert previous ci