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

Backported from 1.4 commit