Revert "**Temporary**" This reverts commit28b86b1148. We don't need this now that copy has been fixed (cherry picked from commitf332151f59)
Revert "**Temporary**" This reverts commit28b86b1148. We don't need this now that copy has been fixed (cherry picked from commitf332151f59)