Backport better easing for long distances