I'd prefer if the next patch is merged into this one, to avoid theconfusing state inbetween entirely.