remove unsupported with_shipping_method in 2-2-stable

Port of #44 for 2-2-stable branch