China & U.S. Trade -- Undoing the China Shock