The new agreement brings a premature end to the previous deal, which was the subject of much angst and protest ...