(bug 42030) Include original URL params in variant links