This will fix player movement. Probably. (2/2)

Backports a commit from 1.4.