AMENDED AND RESTATED CLASS B WARRANT AGREEMENT