The maybe-it's-a-baptism form

One thing that I came across when reading through some stuff on Roman Catholicism a while back was the idea of a conditional baptism. Basically, in practice this seems to just involve tossing a phrase such as "If you are not already baptized" at the beginning of the form. In this way Roman Catholics try to ensure that people aren't baptized more than once, while at they same time ensuring that all are baptized.

I was just thinking about this form, and the thought came to mind as to whether or not this might work to create a greater sense of unity between those adhering to infant baptism and those adhering to adult baptism. Somewhat surprisingly (to me) server logs suggest that people are concerned about this sort of topic as I've had a number of people discover this website in their search for information on rebaptism. Might such a modification satisfy those holding to a believer baptist position without creating unneccessary hostility with those adhering to an infant baptist approach?