switch to new applyVariant only