I did not like the one sent in the previous patch. I think this
one is more clean and correct. I tried with acme and omero with
plumber and youps.