Cherry pick "Use transform.position when updating train position" as well. Even though this should be worse, it's actually better due to the parenting situation (see original commit message).