Revert "Merge branch 'feat/ENG-2697-variant' into feat/ENG-2697"

This reverts commit bdfdcd36e6e0181ee67baf15b5368243bf438b03, reversing
changes made to 090a9421a717bc052b0b414cf68fae71b0e1b380.