Revert "Revert "Revert "Revert "Revert "Revert "move object""""""

This reverts commit 6b213831f6b1f45e991916f76b6158bfb7cbcfb1.