reverting to spree 2.1.  2.2 is changing too quickly.