Revert db6b394..3364f03

This rolls back to commit db6b39453f40e680c9d1fd863a5b33b8b802405b.
Revert "Merge branch 'my-Copy'"

This reverts commit 3364f036434fdb4863b557e34c06bc4365349d4f, reversing
changes made to db6b39453f40e680c9d1fd863a5b33b8b802405b.