FINALLY Actual fix for editing shipping method from order form.