Bipartisan Infrastructure Deal Back On Track