Move to spree 2-2-stable