I've reverted back.  I think the original behaviour is correct.