Issue #2351411 by chx, davidhernandez: Fixed [perf] Shortcut reruns routing.