Merge pull request #2620 from reaperhulk/opt-out-exarkun