Merge "Clean up a workaround for product variants" into main