Revert "Fixed problems with references to the $options array"

This reverts commit 29ff15e381f6ad48410a47e3d1663d1dfd4f650a.