Revert "Somehow messed up grid movement..."

This reverts commit ae7b0794e091d2a550faad0accdf9602405046e4.