Build broken due to HIVE-5773 - Fix build due to conflict between HIVE-5711 and HIVE-5713

[Brock Noland]

My mistake...patch is up.

Once committed, all precommit tests will need to be restarted by uploading
the patch again.

Brock