Issue #2449743 by root_brute, tstoeckler: SwitchShortcutSet has an unnecessary dependency on the route match