Tries to get variant switching working again