This clashes with our changes to cloning(and it's also stupid). Please revert this.