HIVE-8913: revert imports reorder