Merge "Remove dependencies on the 1-variant fallback" into main