Can someone help me with "Incident in a Rose Garden"?

I know that there is a version of the poem that starts off like this,



"Gardener

Sir, I encountered Death

Just now among our roses

Thin as a scythe he stood there.



I knew him by his pictures

He had on his black coat

Black gloves, and broad black hat."



..and it goes on with the rest of the poem.





but i read another version with more stanza's in it last year in my English class that one of the lines was talking about death that looks "dressed like a spanish waiter"







does anyone know the version i'm talking about, and if they could post it. thanks.

Can someone help me with "Incident in a Rose Garden"?
only answer = best answer.