Revert "fixed issue: moving across servers"

This reverts commit 8f014dbfaf43195b13a02121e03a7dfea0c73757.