Remove cloning where it isn't happening anyways.

Follows f10c6df593a764141cbccb217ababe3eae87e53a.
Related to bug 48048.

Change-Id: I52130ec5ea911fe3f11007c69c39280b220bb542
Merge "Remove cloning where it isn't happening anyways."