Revert "adding options clone fix"

This reverts commit 0fa760ea7cafa2d5421c1507dce4ddf7bd8730b1.