Remove Move modification for now (readd later bits by bits.
Keep this.
Fix compile error.
Merge pull request #1043 from ESwordTheCat/riW3nfAj

Revert Move modifications (will redo later bits by bits)