Rolling back to spree 2.1