Revert "Merge pull request #12000 from nullaus/operator-variant"

This reverts commit cfcea746250d7c6ea01a389c3d7714c471f28641, reversing
changes made to ba071b88afd06682117b194a6cccc5cb2d6d7a48.

Reverting because it is failing a unit test