AMENDED AND RESTATED CLASS D WARRANT AGREEMENT