All Change in this file is actually reverting back HIVE-5181