US to Overhaul Metal Tariffs, Hitting Finished Goods With 25% Rate