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

This reverts commit 75c3c4f319cce372575a0ad60151cc8082b4005a.