Revert "Copy World optimization"

This reverts commit 9a5f52e3ab5c420728bb8b77c8cbaba8e8667f88.