Rename ifdef'd out option name.  #3897

This way, if we ever get Quill working again, we won't have
conflicting option names.