Reverted changes to code that broke movement