Bug 1840 followup: copy change