I have moved the backend code from #989 so the lang switcher implementation won't block this canonical URL implementation.