Shipping option restored in checkout. Closes #289