HIVE-7770 : Undo backward-incompatible behaviour change introduced by HIVE-7341 (Mithun Radhakrishnan via Sushanth Sowmyan)