Yes, what you will be doing is a "re-characterization" of the conversion. You actually have until Oct 15 to do a re-characterization.
However, your use of terminology hints that you might not really have the "same issue". You are not moving money "out", you are moving money "back" to the TIRA. It is not as if "contribution" didn't happen; it's a "conversion" that didn't happen. If what you really have is an excess contribution, you should ask a new question, rather than tagging on to a question on a different subject
