Colombia has walked back from the brink of a damaging trade war with the United States, reaching an agreement on accepting deported migrants being returned on military planes, after a flurry of threats from President Donald Trump that included steep tariffs.

Colombian President Gustavo Petro announced that Colombia was suspending permission for previously authorized U.S. deportation flights to land in Colombia. Ostensibly driving Petro’s action were concerns that Colombian nationals were not being treated with respect during the deportation process because they were being transported by military aircraft.

Colombia’s president said his nation would not accept flights of deported migrants. Then each country announced retaliatory tariffs.