Probably.

I'm usually the one who tells the client they have an excess contribution so I'm always proactive in working with the client/custodian to figure out how much earnings have to be removed and include that amount prospectively on the current year return.  Then when the 1099-R arrives next year I just match it up and stick it in the file.

Rick