Added a parameter to optionally not do this cloning.