Reverted modifications to options definition