Why has this logic changed? I can't see what it has to do with removing the use of `_clone()`