I think this should probably be the default behaviour, unless it's explicitly disabled?