Did you consider removing the "patch" flag? This is a bit of a hack, but at least this works on a per patch basis and doesn't hurt AFAIK. -- Loïc Minier