Revert "speed improvement for object cloning"

This reverts commit d1a1c974fbbaa511e0346cfb137477237434bd80.