revert the movement mechanism changes

The new "better" mechanism did not work with some special characters,
even after some tweaks. Reverting for now.