Revert "VIX-144: Copy and Paste Issue fix 2"

This reverts commit 6e69bea98e678252c689fc7adad1e8061f774e11.