Add an option to disable handling Origin