Hotfix for diagonal drifting

Last minute untested changes that couldn't ~possibly~ have any effect are bad, it seems.
Merge pull request #5543 from MrPerson/hotfixes_for_the_hotfix_god

Hotfix for diagonal drifting