I personally saw Hudhaifa asking for water in Mada'in and a man giving it to him in a silver vessel. The rest of the hadith is the same.
Sahih Muslim Book 37, Hadith 12